3 files changed, 8 insertions, 4 deletions
diff --git a/perllib/FixMyStreet/DB/ResultSet/DefectType.pm b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
index 5b1247129..c4c11042f 100644
--- a/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/DefectType.pm
@@ -12,7 +12,7 @@ sub join_table {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
+    my ($rs, $params, @ts) = @_;
     return map {
         my $meta = $_->get_extra_metadata();
         my %extra = map { $_ => $meta->{$_} } keys %$meta;
diff --git a/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
index 96f7cf7a0..af605afa6 100644
--- a/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/ResponsePriority.pm
@@ -12,8 +12,12 @@ sub join_table {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
-    return map { { id => $_->id, name => $_->name } } @ts;
+    my ($rs, $params, @ts) = @_;
+    my $current = $params->{problem} && $params->{problem}->response_priority_id || 0;
+    return
+        map { { id => $_->id, name => $_->name } }
+        grep { !$_->deleted || $_->id == $current }
+        @ts;
 }
 
 1;
diff --git a/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm b/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
index 46fcba153..88ecc2f94 100644
--- a/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
+++ b/perllib/FixMyStreet/DB/ResultSet/ResponseTemplate.pm
@@ -14,7 +14,7 @@ sub name_column {
 }
 
 sub map_extras {
-    my ($rs, @ts) = @_;
+    my ($rs, $params, @ts) = @_;
     return map {
         my $out = { id => $_->text, name => $_->title };
         $out->{state} = $_->state if $_->state;