6 files changed, 16 insertions, 7 deletions
diff --git a/web/cobrands/bathnes/assets.js b/web/cobrands/bathnes/assets.js
index f508ca97c..fb31749f2 100644
--- a/web/cobrands/bathnes/assets.js
+++ b/web/cobrands/bathnes/assets.js
@@ -207,15 +207,24 @@ fixmystreet.assets.add(fixmystreet.maps.banes_defaults, {
     all_categories: true, // Not really, but want to allow on all but one, not stop
     no_asset_msg_id: '#js-not-a-road',
     cat_map: {
+      'Blocked drain surface': 'road',
+      'Blocked drain': 'road',
       'Damage to pavement': 'pavement',
-      'Damage to road': 'road'
+      'Damage to road': 'road',
+      'Damaged Railing, manhole, or drain cover': 'road',
+      'Damaged bollard or post': 'road',
+      'Damaged road sign': 'road',
+      'Damaged street nameplate': 'road',
+      'Faded road markings': 'road',
+      'Flooding of a road or pavement': 'road'
     },
     actions: {
         found: fixmystreet.message_controller.road_found,
         not_found: function(layer) {
             var cat = $('select#form_category').val();
-            if (cat === 'Damage to pavement' || cat === 'Damage to road') {
-                layer.fixmystreet.asset_item = layer.fixmystreet.cat_map[cat];
+            var asset_item = layer.fixmystreet.cat_map[cat];
+            if (asset_item) {
+                layer.fixmystreet.asset_item = asset_item;
                 fixmystreet.message_controller.road_not_found(layer);
             } else {
                 fixmystreet.message_controller.road_found(layer);
diff --git a/web/cobrands/bexley/js.js b/web/cobrands/bexley/assets.js
index a500ebbf3..a500ebbf3 100644
--- a/web/cobrands/bexley/js.js
+++ b/web/cobrands/bexley/assets.js
diff --git a/web/cobrands/fixmystreet-uk-councils/alloy.js b/web/cobrands/fixmystreet-uk-councils/alloy.js
index 27e43a4dd..77494f975 100644
--- a/web/cobrands/fixmystreet-uk-councils/alloy.js
+++ b/web/cobrands/fixmystreet-uk-councils/alloy.js
@@ -122,7 +122,7 @@ OpenLayers.Strategy.Alloy = OpenLayers.Class(OpenLayers.Strategy.FixMyStreet, {
 
 });
 
-fixmystreet.assets.alloy_defaults = {
+fixmystreet.alloy_defaults = {
     http_options: {
       base: "https://alloy-api-tile01.yotta.co.uk/api/render-layer/tile/${layerid}/${environment}/${layerVersion}/${z}/${x}/${y}",
     },
diff --git a/web/cobrands/fixmystreet/fixmystreet.js b/web/cobrands/fixmystreet/fixmystreet.js
index cee8271e7..15ba18df4 100644
--- a/web/cobrands/fixmystreet/fixmystreet.js
+++ b/web/cobrands/fixmystreet/fixmystreet.js
@@ -453,7 +453,7 @@ $.extend(fixmystreet.set_up, {
         }
         if (data && data.non_public) {
             $(".js-hide-if-private-category").hide();
-            $(".js-hide-if-public-category").show();
+            $(".js-hide-if-public-category").removeClass("hidden-js").show();
         } else {
             $(".js-hide-if-private-category").show();
             $(".js-hide-if-public-category").hide();
diff --git a/web/cobrands/northamptonshire/assets.js b/web/cobrands/northamptonshire/assets.js
index 67d75fb97..9f1e0750d 100644
--- a/web/cobrands/northamptonshire/assets.js
+++ b/web/cobrands/northamptonshire/assets.js
@@ -365,7 +365,7 @@ OpenLayers.Layer.NCCVectorAsset = OpenLayers.Class(OpenLayers.Layer.VectorAsset,
 // default options for northants assets include
 // a) checking for multiple assets in same location
 // b) preventing submission unless an asset is selected
-var northants_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, {
+var northants_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
   class: OpenLayers.Layer.NCCVectorAsset,
   protocol_class: OpenLayers.Protocol.Alloy,
   http_options: {
@@ -442,7 +442,7 @@ $.each(layers, function(index, layer) {
 
 // NCC roads layers which prevent report submission unless we have selected
 // an asset.
-var northants_road_defaults = $.extend(true, {}, fixmystreet.assets.alloy_defaults, {
+var northants_road_defaults = $.extend(true, {}, fixmystreet.alloy_defaults, {
     protocol_class: OpenLayers.Protocol.Alloy,
     http_options: {
         environment: is_live ? 26 : 28
diff --git a/web/cobrands/peterborough/js.js b/web/cobrands/peterborough/assets.js
index 47172712d..47172712d 100644
--- a/web/cobrands/peterborough/js.js
+++ b/web/cobrands/peterborough/assets.js