2 files changed, 7 insertions, 8 deletions

diff --git a/perllib/FixMyStreet/App/Controller/Dashboard.pm b/perllib/FixMyStreet/App/Controller/Dashboard.pm
index aadd913ca..7dc09186b 100644
--- a/perllib/FixMyStreet/App/Controller/Dashboard.pm
+++ b/perllib/FixMyStreet/App/Controller/Dashboard.pm
@@ -300,6 +300,8 @@ sub export_as_csv : Private {
             'Easting',
             'Northing',
             'Report URL',
+            'Site Used',
+            'Reported As',
         ],
         columns => [
             'id',
@@ -319,6 +321,8 @@ sub export_as_csv : Private {
             'local_coords_x',
             'local_coords_y',
             'url',
+            'site_used',
+            'reported_as',
         ],
         filename => do {
             my %where = (
@@ -398,6 +402,9 @@ sub generate_csv : Private {
             $report->local_coords;
         $hashref->{url} = join '', $c->cobrand->base_url_for_report($report), $report->url;
 
+        $hashref->{site_used} = $report->service || $report->cobrand;
+        $hashref->{reported_as} = $report->get_extra_metadata('contributed_as') || '';
+
         if (my $fn = $c->stash->{csv}->{extra_data}) {
             my $extra = $fn->($report);
             $hashref = { %$hashref, %$extra };
diff --git a/perllib/FixMyStreet/Cobrand/BathNES.pm b/perllib/FixMyStreet/Cobrand/BathNES.pm
index c02c9328c..d69853881 100644
--- a/perllib/FixMyStreet/Cobrand/BathNES.pm
+++ b/perllib/FixMyStreet/Cobrand/BathNES.pm
@@ -216,39 +216,31 @@ sub dashboard_export_add_columns {
         @{ $c->stash->{csv}->{headers} },
         "User Email",
         "User Phone",
-        "Reported As",
         "Staff User",
         "Attribute Data",
-        "Site Used",
     ];
 
     $c->stash->{csv}->{columns} = [
         @{ $c->stash->{csv}->{columns} },
         "user_email",
         "user_phone",
-        "reported_as",
         "staff_user",
         "attribute_data",
-        "site_used",
     ];
 
     $c->stash->{csv}->{extra_data} = sub {
         my $report = shift;
 
-        my $reported_as = $report->get_extra_metadata('contributed_as') || '';
         my $staff_user = '';
         if ( my $contributed_by = $report->get_extra_metadata('contributed_by') ) {
             $staff_user = $c->model('DB::User')->find({ id => $contributed_by })->email;
         }
-        my $site_used = $report->service || $report->cobrand || '';
         my $attribute_data = join "; ", map { $_->{name} . " = " . $_->{value} } @{ $report->get_extra_fields };
         return {
             user_email => $report->user->email || '',
             user_phone => $report->user->phone || '',
-            reported_as => $reported_as,
             staff_user => $staff_user,
             attribute_data => $attribute_data,
-            site_used => $site_used,
         };
     };
 }