4 files changed, 15 insertions, 6 deletions
diff --git a/templates/web/default/admin/report_edit.html b/templates/web/default/admin/report_edit.html
index b76d1717a..91af70d14 100644
--- a/templates/web/default/admin/report_edit.html
+++ b/templates/web/default/admin/report_edit.html
@@ -22,6 +22,9 @@
 [% IF problem.used_map %][% loc('used map') %][% ELSE %][% loc("didn't use map") %][% END %])</li>
 
 <li>[% loc('For council(s):') %] [% IF problem.bodies_str %][% problem.bodies_str %][% ELSE %]<em>[% loc('None' ) %]</em>[% END %] ([% loc('other areas:') %] [% problem.areas | remove('^,') | remove( ',$' ) %])</li>
+[% IF problem.extra.address %]
+<li>[% loc('Property address:') %] [% problem.extra.address | html %]</li>
+[% END %]
 <li><label class="inline" for="state">[% loc('State:') %]</label> <select name="state"  id="state">
     [% FOREACH state IN [ ['confirmed', loc('Open')], ['investigating',
     loc('Investigating')], ['planned', loc('Planned')], ['in progress',
diff --git a/templates/web/default/faq/faq-en-gb.html b/templates/web/default/faq/faq-en-gb.html
index 26f93afb8..bf47a1420 100755
--- a/templates/web/default/faq/faq-en-gb.html
+++ b/templates/web/default/faq/faq-en-gb.html
@@ -18,7 +18,7 @@ or clearing</strong>, such as:
     <li>Flytipping or litter
     <li>Streetcleaning, such as broken glass in a cycle lane
     [% IF c.cobrand.moniker != 'southampton' %]
-    <li>Unlit lamposts
+    <li>Unlit lampposts
     [% END %]
     <li>Potholes
     </ul>
diff --git a/templates/web/default/report/new/category.html b/templates/web/default/report/new/category.html
index a701e0851..a6f2bf14d 100644
--- a/templates/web/default/report/new/category.html
+++ b/templates/web/default/report/new/category.html
@@ -3,7 +3,12 @@
     [% IF category;
         category = category | lower;
        END; %]
-    <label for='form_category' id="form_category_label">[% category_label | html %]</label>
+    <label for='form_category' id="form_category_label">
+      [%- IF c.cobrand.moniker == 'emptyhomes' %]
+        [%- loc('Property type:') %]
+      [%- ELSE %]
+        [%- loc('Category') %]
+      [%- END -%]</label>
     <select name='category' id='form_category'[% ' onchange="form_category_onchange()"' IF category_extras.size %]>
         [% FOREACH cat_op IN category_options %]
         [% cat_op_lc = cat_op | lower %]
diff --git a/templates/web/default/report/updates.html b/templates/web/default/report/updates.html
index f56ded735..83f746d56 100644
--- a/templates/web/default/report/updates.html
+++ b/templates/web/default/report/updates.html
@@ -28,14 +28,15 @@
     [%- IF update.mark_open %][% update_state = ", " _ loc( 'reopened' ) %][% END %]
     [%- IF !update_state && update.problem_state %]
         [%- state = update.meta_problem_state %]
-        [%- IF ( c.cobrand.moniker == 'bromley' OR update.user.council == 'Bromley Council' ) AND update.problem_state == 'unable to fix' %]
-            [%- state = loc('no further action') %]
-        [% END %]
+        [%- IF c.cobrand.moniker == 'bromley' OR problem.bodies_str == '2482' %]
+            [%- SET state = loc('no further action') IF update.problem_state == 'unable to fix' %]
+            [%- SET state = loc('third party responsibility') IF update.problem_state == 'not responsible' %]
+        [%- END %]
         [%- IF update.problem_state == 'confirmed' AND global.last_state != '' %]
             [%- update_state = ", " _ loc('reopened') %]
         [%- ELSIF update.problem_state != 'confirmed' %]
             [%- update_state = ", " _ tprintf(loc( 'marked as %s' ), state ) %]
-        [% END %]
+        [%- END %]
     [%- END %]
     [%- update_state IF update_state != global.last_state %]
     [%- global.last_state = update_state %]