3 files changed, 18 insertions, 3 deletions

diff --git a/perllib/FixMyStreet/Cobrand/TfL.pm b/perllib/FixMyStreet/Cobrand/TfL.pm
index b80929f25..8e133fa58 100644
--- a/perllib/FixMyStreet/Cobrand/TfL.pm
+++ b/perllib/FixMyStreet/Cobrand/TfL.pm
@@ -421,7 +421,19 @@ sub munge_reports_area_list {
 }
 
 sub munge_report_new_contacts { }
-sub munge_report_new_bodies { }
+
+sub munge_report_new_bodies {
+    my ($self, $bodies) = @_;
+
+    # Highways England handling
+    my $c = $self->{c};
+    my $he = FixMyStreet::Cobrand::HighwaysEngland->new({ c => $c });
+    my $on_he_road = $c->stash->{on_he_road} = $he->report_new_is_on_he_road;
+
+    if (!$on_he_road) {
+        %$bodies = map { $_->id => $_ } grep { $_->name ne 'Highways England' } values %$bodies;
+    }
+}
 
 sub munge_surrounding_london {
     my ($self, $bodies) = @_;
diff --git a/perllib/FixMyStreet/Map/GoogleOL.pm b/perllib/FixMyStreet/Map/GoogleOL.pm
index 44d0e77e7..7049b27d4 100644
--- a/perllib/FixMyStreet/Map/GoogleOL.pm
+++ b/perllib/FixMyStreet/Map/GoogleOL.pm
@@ -16,7 +16,7 @@ sub map_template { 'google-ol' }
 sub map_javascript {
     my $google_maps_url = "https://maps.googleapis.com/maps/api/js?v=3";
     my $key = FixMyStreet->config('GOOGLE_MAPS_API_KEY');
-    $google_maps_url .= "&key=$key" if $key;
+    $google_maps_url .= "&key=$key" if $key;
     [
         $google_maps_url,
         '/vendor/OpenLayers/OpenLayers.google.js',
diff --git a/perllib/Open311/GetServiceRequestUpdates.pm b/perllib/Open311/GetServiceRequestUpdates.pm
index 09b1f6b26..9fa81ac9e 100644
--- a/perllib/Open311/GetServiceRequestUpdates.pm
+++ b/perllib/Open311/GetServiceRequestUpdates.pm
@@ -304,17 +304,20 @@ sub comment_text_for_request {
     my $ext_code_changed = $ext_code ne $old_ext_code;
     my $template;
     if ($state_changed || $ext_code_changed) {
+        my $order;
         my $state_params = {
             'me.state' => $state
         };
         if ($ext_code) {
             $state_params->{'me.external_status_code'} = $ext_code;
+            # make sure that empty string/nulls come last.
+            $order = { order_by => \"me.external_status_code DESC NULLS LAST" };
         };
 
         if (my $t = $problem->response_templates->search({
             auto_response => 1,
             -or => $state_params,
-        })->first) {
+        }, $order )->first) {
             $template = $t->text;
         }
     }