4 files changed, 10 insertions, 10 deletions
diff --git a/perllib/FixMyStreet/App/Controller/Contact.pm b/perllib/FixMyStreet/App/Controller/Contact.pm
index 06566a8ab..8477dd694 100644
--- a/perllib/FixMyStreet/App/Controller/Contact.pm
+++ b/perllib/FixMyStreet/App/Controller/Contact.pm
@@ -93,11 +93,11 @@ sub determine_contact_type : Private {
     } elsif ($id) {
         $c->forward( '/report/load_problem_or_display_error', [ $id ] );
         if ($update_id) {
-            my $update = $c->model('DB::Comment')->search(
+            my $update = $c->cobrand->updates->search(
                 {
-                    id => $update_id,
+                    "me.id" => $update_id,
                     problem_id => $id,
-                    state => 'confirmed',
+                    "me.state" => 'confirmed',
                 }
             )->first;
 
diff --git a/perllib/FixMyStreet/App/Controller/Photo.pm b/perllib/FixMyStreet/App/Controller/Photo.pm
index d7a5b4bb3..5507e3a94 100644
--- a/perllib/FixMyStreet/App/Controller/Photo.pm
+++ b/perllib/FixMyStreet/App/Controller/Photo.pm
@@ -52,7 +52,7 @@ sub index :LocalRegex('^(c/)?([1-9]\d*)(?:\.(\d+))?(?:\.(full|tn|fp))?\.(?:jpeg|
 
     my $item;
     if ( $is_update ) {
-        ($item) = $c->model('DB::Comment')->search( {
+        ($item) = $c->cobrand->updates->search( {
             'me.id' => $id,
             'me.state' => 'confirmed',
             'problem.state' => [ FixMyStreet::DB::Result::Problem->visible_states() ],
diff --git a/perllib/FixMyStreet/App/Controller/Questionnaire.pm b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
index d2b0bf3f4..ab6117ae4 100755
--- a/perllib/FixMyStreet/App/Controller/Questionnaire.pm
+++ b/perllib/FixMyStreet/App/Controller/Questionnaire.pm
@@ -290,9 +290,9 @@ sub display : Private {
 
     my $problem = $c->stash->{questionnaire}->problem;
 
-    $c->stash->{updates} = [ $c->model('DB::Comment')->search(
-        { problem_id => $problem->id, state => 'confirmed' },
-        { order_by => 'confirmed' }
+    $c->stash->{updates} = [ $c->cobrand->updates->search(
+        { problem_id => $problem->id, "me.state" => 'confirmed' },
+        { order_by => 'me.confirmed' }
     )->all ];
 
     $c->stash->{page} = 'questionnaire';
diff --git a/perllib/FixMyStreet/App/Controller/Report.pm b/perllib/FixMyStreet/App/Controller/Report.pm
index eb6050fde..662f865c3 100644
--- a/perllib/FixMyStreet/App/Controller/Report.pm
+++ b/perllib/FixMyStreet/App/Controller/Report.pm
@@ -183,9 +183,9 @@ sub load_problem_or_display_error : Private {
 sub load_updates : Private {
     my ( $self, $c ) = @_;
 
-    my $updates = $c->model('DB::Comment')->search(
-        { problem_id => $c->stash->{problem}->id, state => 'confirmed' },
-        { order_by => [ 'confirmed', 'id' ] }
+    my $updates = $c->cobrand->updates->search(
+        { problem_id => $c->stash->{problem}->id, "me.state" => 'confirmed' },
+        { order_by => [ 'me.confirmed', 'me.id' ] }
     );
 
     my $questionnaires_still_open = $c->model('DB::Questionnaire')->search(