4 files changed, 11 insertions, 1 deletions
diff --git a/perllib/FixMyStreet/App.pm b/perllib/FixMyStreet/App.pm
index 2a279c4e2..36f736cd2 100644
--- a/perllib/FixMyStreet/App.pm
+++ b/perllib/FixMyStreet/App.pm
@@ -36,6 +36,11 @@ our $VERSION = '0.01';
 
 __PACKAGE__->config(
 
+    # Use REQUEST_URI, not PATH_INFO, to infer path. This fixes an issue
+    # with slashes in category names in admin (as PATH_INFO can't tell
+    # the difference between / and %2F)
+    use_request_uri_for_path => 1,
+
     # get the config from the core object
     %{ FixMyStreet->config() },
 
diff --git a/perllib/FixMyStreet/App/Controller/JSON.pm b/perllib/FixMyStreet/App/Controller/JSON.pm
index e1e135054..ccc5b31dc 100644
--- a/perllib/FixMyStreet/App/Controller/JSON.pm
+++ b/perllib/FixMyStreet/App/Controller/JSON.pm
@@ -87,6 +87,7 @@ sub problems : Local {
     my $query = {
         $date_col => $range->sql,
         state => [ @state ],
+        non_public => 0,
     };
     $query->{category} = $category if $category;
     my @problems = $c->cobrand->problems->search( $query, {
diff --git a/perllib/FixMyStreet/App/Controller/Open311.pm b/perllib/FixMyStreet/App/Controller/Open311.pm
index 97e1a782a..841330e92 100644
--- a/perllib/FixMyStreet/App/Controller/Open311.pm
+++ b/perllib/FixMyStreet/App/Controller/Open311.pm
@@ -309,7 +309,8 @@ sub get_requests : Private {
     delete $states->{unconfirmed};
     delete $states->{submitted};
     my $criteria = {
-        state => [ keys %$states ]
+        state => [ keys %$states ],
+        non_public => 0,
     };
 
     my %rules = (
@@ -414,6 +415,7 @@ sub get_request : Private {
     my $criteria = {
         state => [ keys %$states ],
         id => $id,
+        non_public => 0,
     };
     $c->forward( 'output_requests', [ $criteria ] );
 }
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index e26e846c3..773edd3c3 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -22,6 +22,8 @@ sub contact_email {
     return join( '@', 'councilconnect_rejections', 'bathnes.gov.uk' );
 }
 
+sub suggest_duplicates { 1 }
+
 sub admin_user_domain { 'bathnes.gov.uk' }
 
 sub base_url {