author update: convert custom arxiv categories to schema enum ones
HepNames contains categories for authors that resemble arXiv categories but they are not.

For example, there are values like ACC-PHYS <https://inspirehep.net/search?ln=en&cc=HepNames&p=65017%3AACC-PHYS&action_search=Search&sf=exactfirstauthor&so=a>
but we don't have those in the schema https://github.com/inspirehep/inspire-schemas/blob/master/inspire_schemas/records/elements/arxiv_categories.json so `dojson` filters them out and the update form is not correctly populated.
diff --git a/inspirehep/bat/pages/holding_panel_author_detail.py b/inspirehep/bat/pages/holding_panel_author_detail.py
index 75cd77ea..140c9f7b 100644
--- a/inspirehep/bat/pages/holding_panel_author_detail.py
+++ b/inspirehep/bat/pages/holding_panel_author_detail.py
@@ -53,8 +53,8 @@ def load_submitted_record(input_data):
             'http://www.example3.com' in record and
             'http://www.example4.com' in record and
             'http://www.example5.com' in record and
-            'ACC-PHYS' in record and
-            'ASTRO-PH' in record and
+            'cond-mat' in record and
+            'astro-ph' in record and
             'Bob White' in record and
             'CERN' in record and
             '2000' in record and
@@ -83,7 +83,7 @@ def accept_record():
         return 'Accepted as Non-CORE' in WebDriverWait(Arsenic(), 10).until(
             EC.visibility_of_element_located((By.XPATH, '//div[@class="alert ng-scope alert-accept"]'))).text
 
-    Arsenic().find_element_by_xpath('//button[@class="btn btn-success"]').click()
+    Arsenic().find_element_by_id('btn-accept').click()
     return ArsenicResponse(_accept_record)
 
 
@@ -92,7 +92,7 @@ def reject_record():
         return 'Rejected' in WebDriverWait(Arsenic(), 10).until(
             EC.visibility_of_element_located((By.XPATH, '//div[@class="alert ng-scope alert-reject"]'))).text
 
-    Arsenic().find_element_by_xpath('//button[@class="btn btn-danger"]').click()
+    Arsenic().find_element_by_id('btn-reject-submission').click()
     return ArsenicResponse(_reject_record)
 
 
@@ -101,7 +101,7 @@ def curation_record():
         return 'Accepted with Curation' in WebDriverWait(Arsenic(), 10).until(
             EC.visibility_of_element_located((By.XPATH, '//span[@ng-switch-when="accept_curate"]'))).text
 
-    Arsenic().find_element_by_xpath('//button[@class="btn btn-warning"]').click()
+    Arsenic().find_element_by_id('btn-accept-curation').click()
     return ArsenicResponse(_curation_record)
 
 
@@ -112,5 +112,5 @@ def review_record():
             WebDriverWait(Arsenic(), 10).until(EC.visibility_of_element_located((By.ID, 'bai')))
         )
 
-    Arsenic().find_element_by_xpath('(//button[@class="btn btn-info"])[2]').click()
+    Arsenic().find_element_by_id('btn-review-submission').click()
     return ArsenicResponse(_review_record)
diff --git a/inspirehep/bat/pages/holding_panel_author_list.py b/inspirehep/bat/pages/holding_panel_author_list.py
index a73b410b..7ddda0f2 100644
--- a/inspirehep/bat/pages/holding_panel_author_list.py
+++ b/inspirehep/bat/pages/holding_panel_author_list.py
@@ -62,9 +62,8 @@ def load_submission_record(input_data):
     def _load_submission_record():
         return (
             'CERN' in record and
-            # FIXME: currently not shown.
-            # 'ACC-PHYS' in myrecord and
-            # 'ASTRO-PH' in myrecord and
+            'cond-mat' in record and
+            'astro-ph' in record and
             'Twain, Mark' in record and
             'admin@inspirehep.net' in record
         )
diff --git a/inspirehep/config.py b/inspirehep/config.py
index 3677410c..ff089761 100644
--- a/inspirehep/config.py
+++ b/inspirehep/config.py
@@ -1106,7 +1106,7 @@ RECORDS_REST_FACETS = {
     },
     "records-authors": {
         "filters": {
-            "inspire_categories": terms_filter('inspire_categories.term'),
+            "arxiv_categories": terms_filter('arxiv_categories'),
             "institution": terms_filter('positions.institution.name')
         },
         "aggs": {
diff --git a/inspirehep/modules/authors/dojson/fields/updateform.py b/inspirehep/modules/authors/dojson/fields/updateform.py
index 0c722ff7..ee68f916 100644
--- a/inspirehep/modules/authors/dojson/fields/updateform.py
+++ b/inspirehep/modules/authors/dojson/fields/updateform.py
@@ -28,7 +28,6 @@ in order to produce MARCXML.
 
 from __future__ import absolute_import, division, print_function
 
-from dojson import utils
 from dojson.errors import IgnoreKey
 
 from ..model import updateform
@@ -174,12 +173,8 @@ def public_email(self, key, value):
 
 
 @updateform.over('arxiv_categories', '^research_field$')
-@utils.for_each_value
-def inspire_categories(self, key, value):
-    return {
-        "term": value,
-        "source": "user"
-    }
+def arxiv_categories(self, key, value):
+    return value
 
 
 @updateform.over('_positions', '^institution_history$')
diff --git a/inspirehep/modules/authors/forms.py b/inspirehep/modules/authors/forms.py
index 0fdba51f..4208d4f1 100644
--- a/inspirehep/modules/authors/forms.py
+++ b/inspirehep/modules/authors/forms.py
@@ -32,6 +32,7 @@ from wtforms.widgets import html_params, \
     Select, \
     TextInput
 
+from inspire_schemas.utils import load_schema
 from inspirehep.modules.forms.field_widgets import ColumnInput, \
     ExtendedListWidget, \
     ItemWidget, \
@@ -447,33 +448,11 @@ class AuthorUpdateForm(INSPIREForm):
         widget=DynamicUnsortedWidget()
     )
 
-    research_field_options = [("ACC-PHYS", _("acc-phys")),
-                              ("ASTRO-PH", _("astro-ph")),
-                              ("ATOM-PH", _("atom-ph")),
-                              ("CHAO-DYN", _("chao-dyn")),
-                              ("CLIMATE", _("climate")),
-                              ("COMP", _("comp")),
-                              ("COND-MAT", _("cond-mat")),
-                              ("GENL-TH", _("genl-th")),
-                              ("GR-QC", _("gr-qc")),
-                              ("HEP-EX", _("hep-ex")),
-                              ("HEP-LAT", _("hep-lat")),
-                              ("HEP-PH", _("hep-ph")),
-                              ("HEP-TH", _("hep-th")),
-                              ("INSTR", _("instr")),
-                              ("LIBRARIAN", _("librarian")),
-                              ("MATH", _("math")),
-                              ("MATH-PH", _("math-ph")),
-                              ("MED-PHYS", _("med-phys")),
-                              ("NLIN", _("nlin")),
-                              ("NUCL-EX", _("nucl-ex")),
-                              ("NUCL-TH", _("nucl-th")),
-                              ("PHYSICS", _("physics")),
-                              ("PLASMA-PHYS", _("plasma-phys")),
-                              ("Q-BIO", _("q-bio")),
-                              ("QUANT-PH", _("quant-ph")),
-                              ("SSRL", _("ssrl")),
-                              ("OTHER", _("other"))]
+    arxiv_categories_schema = load_schema('elements/arxiv_categories.json')
+    research_field_options = [
+        (val, val)
+        for val in arxiv_categories_schema['enum']
+    ]
 
     research_field = fields.SelectMultipleField(
         label=_('Field of Research'),
diff --git a/inspirehep/modules/authors/templates/authors/workflows/authorupdate.html b/inspirehep/modules/authors/templates/authors/workflows/authorupdate.html
deleted file mode 100644
index c2acd444..00000000
--- a/inspirehep/modules/authors/templates/authors/workflows/authorupdate.html
+++ /dev/null
@@ -1,262 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2015, 2016 CERN.
-#
-# INSPIRE is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE. If not, see <http://www.gnu.org/licenses/>.
-#
-# In applying this licence, CERN does not waive the privileges and immunities
-# granted to it by virtue of its status as an Intergovernmental Organization
-# or submit itself to any jurisdiction.
-#}
-
-{% if not record.name %}
-<div class="alert alert-warning">
-  {{ _('Updates are queued. Formatted information will be available shortly.') }}
-</div>
-  {% else %}
-<div class="panel panel-default">
-  <div class="panel-body">
-  {% if record['name'] %}
-    <b>{{ record['name']['preferred_name'] }}</b>
-  {% endif %}
-  {% if record['native_name'] %}
-    ({{ record['native_name'] }})
-  {% endif %}
-  {% if record['positions'] %}
-    {% set institutions = [] %}
-    {% for inst in record['positions'] %}
-      {% if 'institution' in inst  and  inst['institution']['name'] %}
-        {% do institutions.append(inst['institution']['name']) %}
-      {% endif %}
-    {% endfor%}
-  {% endif %}
-  {% if institutions %}
-    (<a href="/search?cc=Institutions&amp;p=department_acronym:{{ institutions[0] }}">{{ institutions[0] }}</a>)
-  {% endif %}
-  <br>
-  {% if record['name'] %}
-    <a href="http://www.google.com/search?hl=en&amp;q={{ record['name']['display_name'] }}">[Google]</a>
-    <a href="/search?ln=en&amp;cc=HepNames&amp;p=advisors:{{ record['name']['display_name'] }}">[Students]</a>
-    <a href="http://arxiv.org/find/all/1/au:{{ record['name']['value']|replace(',','_') }}/0/1/0/all/0/1?per_page=100">[arXiv]</a>
-    {% endif %}
-  <a href="{{ record|ads_links }}">[ADS]</a>
-  {% if record['ids'] %}
-    {% for type in record['ids'] %}
-      {% if 'type' in type  and type['type'].lower() == 'wikipedia' and type['value'] %}
-        <a href="https://wikipedia.org/wiki/{{ type['type'] }}"`>[Wikipedia]</a>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  <br><br>
-  {% if record['advisors'] %}
-    <label>Advisor:</label> {{ record['advisors']|author_urls('; ')|safe }}
-    <br>
-  {% endif %}
-  {% if record['positions'] %}
-    {% for phd_inst in record['positions'] %}
-      {% if 'rank' in phd_inst and phd_inst['rank'].lower() == 'phd' and phd_inst['institution']['name'] %}
-        <label>PhD Institution:</label>
-        <a href="/search?ln=en&amp;cc=Institutions&amp;p=department_acronym:{{ phd_inst['institution']['name'] }}&amp;action_search=Search&amp;sf=&amp;so=d&amp;rm=&amp;rg=25&amp;sc=0&amp;of=hd">
-            {{ phd_inst['institution']['name'] }}</a>
-        <br/>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['positions'] %}
-    {% set ranks = [] %}
-    {% for rank in record['positions'] %}
-      {% if 'rank' in rank  and rank['rank'].lower() == 'ug' and rank['institution']['name'] %}
-        {% do ranks.append(rank['institution']['name']) %}
-        <label>Undergrad:</label>
-        <a href="/search?ln=en&amp;cc=Institutions&amp;p=department_acronym:{{rank['institution']['name']}}&amp;action_search=Search&amp;sf=&amp;so=d&amp;rm=&amp;rg=25&amp;sc=0&amp;of=hd">{{ rank['institution']['name'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['positions'] %}
-    {% set email_list = [] %}
-    {% for email in record['positions']%}
-      {% if 'email' in email %}
-        {% do email_list.append(email['email']) %}
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if email_list %}
-    <label>Email:</label>
-    {% for element in email_list %}
-      {{ element|email_links|join_array(", ")|safe }}
-    {% endfor %}
-    <br>
-  {% endif %}
-  {% if record['urls'] %}
-    {% for url in record['urls'] %}
-      <label>URL:</label>
-      <a href="{{ url['value'] }}">{{ url['value'] }}</a>
-      <br>
-    {% endfor %}
-  {% endif %}
-  {% if record['ids'] %}
-    {% for id in record['ids'] %}
-      {% if 'type' in id  and id['type'].lower() == 'googlescholar' and id['value'] %}
-        <label>Google Scholar:</label><a href="http://scholar.google.com/citations?user={{ id['value'] }}">http://scholar.google.com/citations?user={{ id['value'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['ids'] %}
-    {% for id in record['ids'] %}
-      {% if 'type' in id and id['type'].lower() == 'arxiv' and id['value'] %}
-        <label>arXiv Author Identifier:</label><a href="http://arxiv.org/a/{{ id['value'] }}">{{ id['value'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['inspire_categories'] %}
-    <label>Field:</label> {{ record['inspire_categories']|join(", ") }}
-    <br>
-  {% endif %}
-  {% if record['experiments'] %}
-    <label>Experiment:</label>
-    {% for experiment in record['experiments'] %}
-      {% if 'name' in experiment %}
-        <a href="/search?ln=en&amp;cc=Experiments&amp;p=experiment:{{ experiment['name'] }}&amp;of=hd">{{ experiment['name'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['ids'] %}
-    {% set exists = [] %}
-    {% for id in record['ids'] %}
-      {% if 'type' in id  and id['type'].lower() == 'bai'  and id['value'] %}
-        {% do exists.append(1) %}
-        <label>Author Profile:</label> <a href="/author/profile/{{ id['value'] }}">{{ id['value'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if not exists %}
-    {% if record['name'] %}
-      <label>Author Profile:</label> <a href="/author/search?q={{ record['name']['value'] }}">{{ record['name']['value'] }}</a>
-      <br>
-    {% endif %}
-  {% endif %}
-  {% if record['ids'] %}
-    {% for id in record['ids'] %}
-      {% if 'type' in id  and id['type'].lower() == 'inspire' and id['value'] %}
-        <label>Inspire ID:</label> {{ id['value'] }}
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['ids'] %}
-    {% for id in record['ids'] %}
-      {% if 'type' in id  and id['type'].lower() == 'orcid' %}
-        <label>ORCID:</label> <a href="http://orcid.org/{{ id['value'] }}">{{ id['value'] }}</a>
-        <br>
-      {% endif %}
-    {% endfor %}
-  {% endif %}
-  {% if record['_curators_note'] %}
-    <label>Note:</label> {{ record['_curators_note']|join(", ") }}
-    <br>
-  {% endif %}
-  <br>
-  <div class="row">
-    <div class="col-md-12">
-    <label>Institutional History:</label>
-      <table class="table">
-      <thead>
-      <tr>
-      {% if institutions %}
-        <th>Institution</th>
-      {% endif %}
-      {% if record['positions'] %}
-        {% set rank_list = [] %}
-        {% for r in record['positions'] %}
-          {% if 'rank' in r %}
-          {% do rank_list.append(1) %}
-          {% endif %}
-        {% endfor %}
-      {% endif%}
-      {% if rank_list %}
-        <th>Rank</th>
-      {% endif %}
-      {% if record['positions'] %}
-        {% set start = [] %}
-        {% for start_date in record['positions'] %}
-          {% if 'start_date' in start_date %}
-          {% do start.append(1) %}
-          {% endif %}
-        {% endfor %}
-      {% endif%}
-      {% if start %}
-        <th>Start Date</th>
-      {% endif %}
-      {% if record['positions'] %}
-      {% set end = [] %}
-        {% for end_date in record['positions'] %}
-          {% if 'end_date' in end_date %}
-            {% do end.append(1) %}
-          {% endif %}
-        {% endfor %}
-      {% endif%}
-      {% if end %}
-        <th>End Date</th>
-      {% endif %}
-      </tr>
-      </thead>
-      <tbody>
-        {% if record['positions'] %}
-        {% for element in record['positions'] %}
-          <tr>
-            {% if 'institution' in element %}
-            <td>
-              <a href="/search?cc=Institutions&amp;p=department_acronym:{{ element['institution']['name'] }}">{{ element['institution']['name'] }}</a>
-            </td>
-            {% endif %}
-            {% if 'rank' in element %}
-              <td>
-                {{ element['rank'] }}
-              </td>
-            {% endif %}
-            {% if 'start_date' in element %}
-              <td>
-                {{ element['start_date'] }}
-              </td>
-            {% endif %}
-            {% if 'end_date' in element %}
-              <td>
-                {{ element['end_date'] }}
-              </td>
-            {% endif %}
-          </tr>
-          {% endfor %}
-        {% endif %}
-      </tbody>
-      </table>
-    </div>
-  </div>
-
-  </div>
-</div>
-  {% endif %}
-<hr>
-<p>Submission from: <a href="mailto:{{user_email}}">{{user_email}}</a></p>
-<p>Corresponding RT ticket: <a href="{{ticket_url}}" target="_blank">{{ticket_url}}</a></p>
-{% if comments %}
-  <p>User left the following comments in the form:
-  <pre>{{comments}}</pre>
-  </p>
-  <br>
-{% endif %}
diff --git a/inspirehep/modules/authors/views/holdingpen.py b/inspirehep/modules/authors/views/holdingpen.py
index e48ccd89..41a74e26 100644
--- a/inspirehep/modules/authors/views/holdingpen.py
+++ b/inspirehep/modules/authors/views/holdingpen.py
@@ -103,10 +103,8 @@ def convert_for_form(data):
                 elif url["description"].lower() == "linkedin":
                     data["linkedin_url"] = url["value"]
         del data["urls"]
-    if 'inspire_categories' in data:
-        data["research_field"] = []
-        for category in data.get('inspire_categories', []):
-            data["research_field"].append(category.get('term'))
+    if 'arxiv_categories' in data:
+        data['research_field'] = data['arxiv_categories']
     if "positions" in data:
         data["institution_history"] = []
         data["public_emails"] = []
diff --git a/inspirehep/modules/literaturesuggest/templates/literaturesuggest/workflows/submission_record.html b/inspirehep/modules/literaturesuggest/templates/literaturesuggest/workflows/submission_record.html
deleted file mode 100644
index 7a274413..00000000
--- a/inspirehep/modules/literaturesuggest/templates/literaturesuggest/workflows/submission_record.html
+++ /dev/null
@@ -1,76 +0,0 @@
-{#
-## This file is part of INSPIRE.
-## Copyright (C) 2014 CERN.
-##
-## INSPIRE is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## INSPIRE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% for author in authors[0:10] %}
-  {% if author %}
-    <a class="greyfaded" href="https://inspirehep.net/search?p=find a {{author.full_name}}">
-      {{author.full_name}}
-    {%- if author != authors[-1] -%}
-    ;
-    {%- endif -%}
-  {%- endif -%}
-  </a>
-{% endfor %}
-
-{% if authors|count > 10 %}
-  et al.
-{% endif %}
-
-{% if message %}
-<p class="lead">{{message}}</p>
-{% endif %}
-
-{% if categories %}
-<ul class="list-inline">
-  {% for category in categories %}
-    <li><h5><span class="label label-default">{{category}}</span></h5></li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-{% if identifiers %}
-<ul class="list-inline">
-  {% for identifier in identifiers %}
-      <li>
-      {% if 'arxiv' in identifier.lower() %}
-        {% set identifier_part = identifier.split(':')[-1] %}
-        <a href="http://arxiv.org/abs/{{identifier_part}}">{{identifier_part}}</a>
-        <a href="http://arxiv.org/pdf/{{identifier_part}}"><i class="fa fa-file-pdf-o"></i> PDF</a>
-      {% elif 'doi:' in identifier.lower() %}
-        {% set identifier_part = identifier.split(':')[-1] %}
-        <a href="http://dx.doi.org/{{identifier_part}}">{{identifier_part}}</a>
-      {% else %}
-        {{identifier}}
-      {% endif %}
-    </li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<p><i class="fa fa-user"></i> {{ user_email }}</p>
-
-{% if doctype %}
-<h5><span class="label label-default">{{doctype}}</span></h5>
-{% endif %}
-
-{% if record.abstracts %}
-<div class="collapse" id="collapsed-abstract-{{object.id}}">
-{{ record.abstracts[0]['value'] }}
-</div>
-<a class="faded toggle" data-toggle="collapse" href="#collapsed-abstract-{{object.id}}" aria-expanded="false" aria-controls="collapsed-abstract-{{object.id}}">Abstract </a>
-{% endif %}
diff --git a/inspirehep/modules/theme/static/scss/holding-pen/holding-pen.scss b/inspirehep/modules/theme/static/scss/holding-pen/holding-pen.scss
index 82fd39f7..f0b77305 100644
--- a/inspirehep/modules/theme/static/scss/holding-pen/holding-pen.scss
+++ b/inspirehep/modules/theme/static/scss/holding-pen/holding-pen.scss
@@ -522,7 +522,7 @@ $hp_table_bg: #fff;
         }
 
         .keyword-list, .subject-list {
-          height: 180px;
+          height: 235px;
           overflow-y: auto;
 
           .list-header {
diff --git a/inspirehep/modules/workflows/search.py b/inspirehep/modules/workflows/search.py
index a08571dc..4010f72b 100644
--- a/inspirehep/modules/workflows/search.py
+++ b/inspirehep/modules/workflows/search.py
@@ -41,7 +41,7 @@ def holdingpen_search_factory(self, search, **kwargs):
     includes = [
         'metadata.titles', 'metadata.abstracts', 'metadata.inspire_categories',
         'metadata.authors', 'metadata.name', 'metadata.positions', 'metadata.acquisition_source',
-        'metadata.inspire_categories', '_workflow', '_extra_data.relevance_prediction',
+        'metadata.arxiv_categories', '_workflow', '_extra_data.relevance_prediction',
         '_extra_data.user_action',
         '_extra_data.classifier_results.complete_output'
     ]
diff --git a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/holdingpen/holdingpen.directives.js b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/holdingpen/holdingpen.directives.js
index e7e6c389..4278bf49 100644
--- a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/holdingpen/holdingpen.directives.js
+++ b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/holdingpen/holdingpen.directives.js
@@ -145,17 +145,6 @@
             $window.location = url;
           },
 
-          addSubjectArea: function () {
-            console.debug($scope.vm.new_subject_area);
-            $scope.vm.record.metadata.inspire_categories.unshift({
-              'source': 'curator',
-              'term': $scope.vm.new_subject_area,
-              'accept': true
-            });
-            $scope.vm.new_subject_area = '';
-            $scope.doUpdate();
-          },
-
           addKeyword: function () {
             if (!$scope.vm.record._extra_data.keywords_prediction)
               $scope.vm.record._extra_data.keywords_prediction = {};
@@ -173,8 +162,10 @@
           },
 
           deleteSubject: function (index) {
-            if (index < $scope.vm.record.metadata.inspire_categories.length)
-              $scope.vm.record.metadata.inspire_categories.splice(index, 1);
+            var categories = $scope.vm.record.metadata.inspire_categories ||
+              $scope.vm.record.metadata.arxiv_categories;
+            if (index < categories.length)
+              categories.splice(index, 1);
             $scope.doUpdate();
           },
 
diff --git a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_decision_authors.html b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_decision_authors.html
index fe9229f4..e9c37a4d 100644
--- a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_decision_authors.html
+++ b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_decision_authors.html
@@ -1,15 +1,19 @@
 <div ng-if="vm.record._extra_data._action === 'author_approval' && vm.record._workflow.status === 'HALTED'">
 <button class="btn btn-info"
-        ng-click="Utils.redirect('/authors/new/review?objectid='+ vm.record.id)">Review Submission
+        ng-click="Utils.redirect('/authors/new/review?objectid='+ vm.record.id)"
+        id="btn-review-submission">Review Submission
 </button>
 <button class="btn btn-danger"
-        ng-click="Utils.setDecision('reject')">Reject
+        ng-click="Utils.setDecision('reject')"
+        id="btn-reject-submission">Reject
 </button>
 <button class="btn btn-warning"
-        ng-click="Utils.setDecision('accept_curate')">Curation
+        ng-click="Utils.setDecision('accept_curate')"
+        id="btn-accept-curation">Curation
 </button>
 <button class="btn btn-success"
-        ng-click="Utils.setDecision('accept')">Accept
+        ng-click="Utils.setDecision('accept')"
+        id="btn-accept">Accept
 </button>
   </div>
 
diff --git a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_subject_areas.html b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_subject_areas.html
index ed26639e..3bf36f98 100644
--- a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_subject_areas.html
+++ b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_subject_areas.html
@@ -19,8 +19,7 @@
 
       <div ng-init="categories = vm.record.metadata.inspire_categories || vm.record.metadata.arxiv_categories">
         <div class="row subject-area" ng-repeat="subject_term in categories">
-          <div class="col-md-9 col-sm-9 col-xs-8"
-               ng-bind="subject_term.term"></div>
+          <div class="col-md-9 col-sm-9 col-xs-8">{{subject_term.term || subject_term}}</div>
           <div class="col-md-2 col-sm-2 col-xs-3">
           <span class="scheme" ng-if="subject_term.source" ng-bind="subject_term.source">
           </span>
@@ -37,19 +36,4 @@
     </div>
   </div>
 
-  <div class="row add-control">
-    <form ng-submit="$event.preventDefault()">
-      <div class="col-md-9 col-sm-9 col-xs-9">
-        <input autocomplete id="new_subject_area"
-               class="form-control" ui-items="names"
-               placeholder="Add a Subject Area" ng-model="vm.new_subject_area">
-      </div>
-      <div class="col-md-3 col-sm-3 col-xs-3">
-        <button class="btn btn-info" ng-click="Utils.addSubjectArea()"><i
-          class="fa fa-plus"></i> Add
-        </button>
-      </div>
-    </form>
-  </div>
-
 </div>
diff --git a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/results.html b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/results.html
index 48bbc9f8..334fe1cd 100644
--- a/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/results.html
+++ b/inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/results.html
@@ -73,14 +73,10 @@
         </div>
 
         <div class="col-md-2 pad-top-10">
-          <ul class="subject-terms">
+          <ul ng-init="categories = record._source.metadata.inspire_categories || record._source.metadata.arxiv_categories" class="subject-terms">
             <li
-              ng-repeat="subject in record._source.metadata.inspire_categories | unique:'term' | limitTo:3"
-              ng-if="record._source.metadata.inspire_categories">{{subject.term}}
-            </li>
-            <li
-              ng-repeat="subject in record._source.metadata.inspire_categories | limitTo:3"
-              ng-if="subject._term">{{subject._term}}
+              ng-repeat="subject in categories | limitTo:3"
+              ng-if="record._source.metadata.inspire_categories || record._source.metadata.arxiv_categories">{{subject.term || subject}}
             </li>
           </ul>
         </div>
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/author_approval_main.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/author_approval_main.html
deleted file mode 100644
index 430176ba..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/author_approval_main.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2015 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% block approval_action %}
-
-<div class="well">
-  {% if 'approved' not in object.extra_data %}
-    <div class="text-left" style="float: left;">
-      <a class="btn btn-info"
-            role="button"
-            href="{{url_for('inspirehep_authors_holdingpen.newreview', objectid=object.id)}}"
-            ><i class="fa fa-edit fa-lg"></i> {{_("Review Submission")}}
-      </a>
-    </div>
-    <div class="text-right">
-      <a class="btn btn-success" role="button" href="{{url_for('inspirehep_authors_holdingpen.holdingpenreview', approved='True', ticket='False', objectid=object.id)}}"><i class="fa fa-check-circle fa-lg"></i> Accept
-      </a>
-      <a class="btn btn-warning" role="button" href="{{url_for('inspirehep_authors_holdingpen.holdingpenreview', approved='True', ticket='True', objectid=object.id)}}"><i class="fa fa-plus-circle fa-lg"></i> Accept + curation
-      </a>
-      <a class="btn btn-danger" role="button" href="{{url_for('inspirehep_authors_holdingpen.holdingpenreview', approved=False, objectid=object.id)}}"><i class="fa fa-trash-o fa-lg"></i> Reject
-      </a>
-  </div>
-  {% else %}
-    <p>
-      <strong>The record was already {% if object.extra_data.get("approved") %} approved {% else %} rejected {% endif %}</strong>
-    </p>
-  {% endif %}
-
-</div>
-
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_main.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_main.html
deleted file mode 100644
index 7412fa3d..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_main.html
+++ /dev/null
@@ -1,67 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014, 2015, 2016 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% from "inspire_workflows/macros.html" import render_prediction %}
-
-{{ render_prediction(object) }}
-
-{% if not "CORE" in object.data.get("collections", [{}])[0].keys() %}
-  <button class="btn btn-success literature-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept_core">{{_("CORE")}}</button>
-{% endif %}
-  <button class="btn btn-warning literature-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept">{{_("Accept")}}</button>
-  <button class="btn btn-danger literature-approval-action-reject"
-        data-objectid="{{object.id}}"
-        data-value="reject"
-        role="button">{{_("Reject")}}</button>
-
-<hr class="separator">
-
-
-<div class="modal fade" id="rejection-modal-{{object.id}}" tabindex="-1" role="dialog" aria-labelledby="rejectionModal" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{_("Cancel")}}</span></button>
-        <h4 class="modal-title" id="exampleModalLabel">{{_("Reason for rejection")}}</h4>
-      </div>
-      <div class="modal-body">
-        <form role="form">
-          <div class="form-group">
-            <label for="message-text" class="control-label">Explain why this was rejected (is sent directly to user):</label>
-            <textarea class="form-control"
-                      id="message-text-{{object.id}}"
-                      cols="50" rows="15">
-              {{ rejection_text }}
-            </textarea>
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_("Close")}}</button>
-        <button type="button" class="btn btn-warning reject-action" data-objectid="{{object.id}}">{{_("Reject")}}</button>
-      </div>
-    </div>
-  </div>
-</div>
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_mini.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_mini.html
deleted file mode 100644
index 0ae4603e..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_mini.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% block approval_action %}
-<div class="action core-approval-action btn-group-vertical" role="group">
-{% if not "CORE" in object.data.get("collections", [{}])[0].keys() %}
-  <button class="btn btn-success literature-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept_core">{{_("CORE")}}</button>
-{% endif %}
-  <button class="btn btn-warning literature-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept">{{_("Accept")}}</button>
-  <button class="btn btn-danger literature-approval-action-reject"
-        data-objectid="{{object.id}}"
-        data-value="reject"
-        role="button">{{_("Reject")}}</button>
-</div>
-
-<div class="modal fade" id="rejection-modal-{{object.id}}" tabindex="-1" role="dialog" aria-labelledby="rejectionModal" aria-hidden="true">
-  <div class="modal-dialog">
-    <div class="modal-content">
-      <div class="modal-header">
-        <button type="button" class="close" data-dismiss="modal"><span aria-hidden="true">&times;</span><span class="sr-only">{{_("Cancel")}}</span></button>
-        <h4 class="modal-title" id="exampleModalLabel">{{_("Reason for rejection")}}</h4>
-      </div>
-      <div class="modal-body">
-        <form role="form">
-          <div class="form-group">
-            <label for="message-text" class="control-label">Explain why this was rejected (is sent directly to user):</label>
-            <textarea class="form-control"
-                      id="message-text-{{object.id}}"
-                      cols="50" rows="15">
-              {{ rejection_text }}
-            </textarea>
-          </div>
-        </form>
-      </div>
-      <div class="modal-footer">
-        <button type="button" class="btn btn-default" data-dismiss="modal">{{_("Close")}}</button>
-        <button type="button" class="btn btn-warning reject-action" data-objectid="{{object.id}}">{{_("Reject")}}</button>
-      </div>
-    </div>
-  </div>
-</div>
-
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_side.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_side.html
deleted file mode 100644
index 464de9c9..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/core_approval_side.html
+++ /dev/null
@@ -1,19 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_main.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_main.html
deleted file mode 100644
index 662032bf..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_main.html
+++ /dev/null
@@ -1,41 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014, 2015, 2016 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% from "inspire_workflows/macros.html" import render_prediction %}
-
-{% block approval_action %}
-
-  {{ render_prediction(object) }}
-
-  {% if not "CORE" in object.data.get("collections", [{}])[0].keys() %}
-    <button class="btn btn-success hep-approval-action-accept"
-          role="button"
-          data-objectid="{{object.id}}"
-          data-value="accept_core">{{_("CORE")}}</button>
-  {% endif %}
-    <button class="btn btn-warning hep-approval-action-accept"
-          role="button"
-          data-objectid="{{object.id}}"
-          data-value="accept">{{_("Accept")}}</button>
-    <button class="btn btn-danger hep-approval-action-reject"
-          data-objectid="{{object.id}}"
-          data-value="reject"
-          role="button">{{_("Reject")}}</button>
-    <hr class="separator">
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_mini.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_mini.html
deleted file mode 100644
index d162eec7..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_mini.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014, 2015 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% block approval_action %}
-<div class="action hep-approval-action btn-group-vertical" role="group">
-{% if not "CORE" in object.data.get("collections", [{}])[0].keys() %}
-  <button class="btn btn-success hep-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept_core"><i class="fa fa-check"></i> {{_("CORE")}}</button>
-{% endif %}
-  <button class="btn btn-warning hep-approval-action-accept"
-        role="button"
-        data-objectid="{{object.id}}"
-        data-value="accept"><i class="fa fa-check"></i> {{_("Accept")}}</button>
-  <button class="btn btn-danger hep-approval-action-reject"
-        data-objectid="{{object.id}}"
-        data-value="reject"
-        role="button"><i class="fa fa-times"></i> {{_("Reject")}}</button>
-
-</div>
-
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_side.html b/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_side.html
deleted file mode 100644
index ad764d26..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/actions/hep_approval_side.html
+++ /dev/null
@@ -1,18 +0,0 @@
-{#
-## This file is part of Invenio.
-## Copyright (C) 2014, 2015 CERN.
-##
-## Invenio is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## Invenio is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with Invenio; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/macros.html b/inspirehep/modules/workflows/templates/inspire_workflows/macros.html
deleted file mode 100644
index fb42a72f..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/macros.html
+++ /dev/null
@@ -1,123 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2014, 2015, 2016 CERN.
-#
-# INSPIRE is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% macro display_classification_brief(results) -%}
-  {% if results %}
-    {% set name = "" %}
-    {% if 'classification' in results %}
-        {% set name = "classification" %}
-    {% elif 'classification_full' in results %}
-        {% set name = "classification_full" %}
-    {% elif 'classification_fast' in results %}
-        {% set name = "classification_fast" %}
-    {% endif %}
-
-    {% set result = [] %}
-    {% set results_extracted = results.get(name, []) %}
-    {% if results_extracted %}
-        {% do result.append(results_extracted[0].get('result', {}).get('dict', {}).get('complete_output')) %}
-    {% endif %}
-    {% if result %}
-        {% set core_keywords = result[0]['Filtered Core keywords'] %}
-        {% if result[0]['Core keywords']|length %}
-        <ul class="list-inline">
-            <li><strong>{{ _('Core') }} ({{ result[0]['Core keywords']|length }}):</strong></li>
-            {% for keyword in core_keywords %}
-                {%- if loop.index < 10 %}
-                    <li><span class="text-danger">{{keyword}}</span></li>
-                {% endif %}
-            {% else %}
-                <li>None</li>
-            {% endfor %}
-        </ul>
-        {% endif %}
-    {% endif %}
-    {% if result_fast %}
-        <em>{{ _("(This task run at fast mode taking into consideration only the title and the abstract)") }}</em>
-    {% endif %}
-  {% endif %}
-{%- endmacro %}
-
-{% macro get_status_badge(label, icon, status) -%}
-    <center><h3><span class="label label-{{ label }}"><i class="fa fa-{{ icon }}"></i> {{ status }}</span></h3></center>
-{%- endmacro %}
-
-{% macro check_status(object) %}
-    {% if object.extra_data.has_key('core') -%}
-
-        {% if object.extra_data['core']  %}
-            {{ get_status_badge('success', 'check', 'CORE') }}
-        {% else %}
-            {% if object.extra_data['approved'] %}
-                {{ get_status_badge('warning', 'check', 'Accepted') }}
-            {% else %}
-                {{ get_status_badge('danger', 'times', 'Rejected') }}
-            {% endif %}
-        {% endif %}
-        <hr class="separator">
-    {% endif %}
-{%- endmacro %}
-
-{% macro batch_action_buttons() %}
-    <div>
-        <div class="pull-right batch-action-buttons hidden">
-        <span class="text-muted">{{ _("For all selected") }}: </span>
-        <div class="btn-group" role="group">
-            <button class="btn btn-success arxiv-approval-action-accept batch-button" role="button" data-value="accept_core">
-                <i class="fa fa-check"></i> CORE
-            </button>
-            <button class="btn btn-warning arxiv-approval-action-accept batch-button" role="button" data-value="accept">
-                <i class="fa fa-check"></i> Accept
-            </button>
-            <button class="btn btn-danger arxiv-approval-action-reject batch-button"  role="button" data-value="reject">
-                <i class="fa fa-times"></i> Reject
-            </button>
-        </div>
-        </div>
-    </div>
-{% endmacro %}
-
-{% macro render_prediction(obj) %}
-
-  {% set results = obj.extra_data._tasks_results %}
-
-  {% if 'arxiv_guessing' in results and results.arxiv_guessing|length > 0 %}
-    {% set result = results.arxiv_guessing[0].result %}
-    {% set score = result.get("max_score") %}
-    {% set decision = result.get("decision") %}
-
-    {% if decision is not none %}
-        {% if decision == "CORE" %}
-          <h4 class="text-success">
-            {{decision}} ({{ score|round(2) }})
-          </h4>
-        {% elif decision == "Non-CORE" %}
-          <h4 class="text-warning">
-            {{decision}} ({{ score|round(2) }})
-          </h4>
-        {% else %}
-          <h4 class="text-danger">
-            {{_('Reject')}} ({{ score|round(2) }})
-          </h4>
-        {% endif %}
-    {% endif %}
-    <hr class="separator">
-  {% endif %}
-
-{% endmacro %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/results/arxiv_guessing.html b/inspirehep/modules/workflows/templates/inspire_workflows/results/arxiv_guessing.html
deleted file mode 100644
index 7e474e66..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/results/arxiv_guessing.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2015 CERN.
-#
-# INSPIRE is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% extends "workflows/results/results_base.html" %}
-
-{% block results_body %}
-
-  {% set result = results.get("result") %}
-  {% set score = result.get("max_score") %}
-  {% set decision = result.get("decision") %}
-
-  {% if decision is not none %}
-    <h4 class="text-right">
-      {% if decision == "CORE" %}
-        <span class="label label-success">
-          {{decision}} ({{ score|round(2) }})
-        </span>
-      {% elif decision == "Non-CORE" %}
-        <span class="label label-warning">
-          {{decision}} ({{ score|round(2) }})
-        </span>
-      {% else %}
-        <span class="label label-danger">
-          {{decision}} ({{ score|round(2) }})
-        </span>
-      {% endif %}
-    </h4>
-  {% endif %}
-
-
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/results/classifier.html b/inspirehep/modules/workflows/templates/inspire_workflows/results/classifier.html
deleted file mode 100644
index 3abc1edf..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/results/classifier.html
+++ /dev/null
@@ -1,127 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2014, 2015, 2016 CERN.
-#
-# INSPIRE is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-
-{% macro display_composite_keyword(title, result) -%}
-  {% if result %}
-    <div class="well">
-      <h5>{{ _(title) }}:</h5>
-      <ul class="list-group">
-        {% for keyword, data in result.items() %}
-          <li class="list-group-item">{{keyword}}: {{data["numbers"]}}, {{data["details"]}}</li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endif %}
-{%- endmacro %}
-
-{% macro display_keyword(title, result) -%}
-  {% if result %}
-    <div class="well">
-      <em>{{ _(title) }}:</em>
-      <ul class="list-group">
-        {% for keyword, times in result|dictsort(false, 'value')|reverse %}
-          <li class="list-group-item">
-            <span class="badge">{{times}}</span>
-            <strong>{{keyword}}</strong>
-          </li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endif %}
-{%- endmacro %}
-
-{% macro display_field_codes(title, result) -%}
-  {% if result %}
-    <div class="well">
-      <em>{{ _(title) }}:</em>
-      <ul class="list-group">
-        {% for keyword, times in result|dictsort(false, 'value')|reverse %}
-          <li class="list-group-item">
-            <span class="badge">{{keyword}}</span>
-            <strong>{{times}}</strong>
-          </li>
-        {% endfor %}
-      </ul>
-    </div>
-  {% endif %}
-{%- endmacro %}
-
-{% macro display_core_keyword(title, result, filtered) -%}
-  {% if result %}
-   <div class="well">
-    <em>{{ _(title) }}:</em>
-    <ul class="list-group">
-      {% for keyword, times in result|dictsort(false, 'value')|reverse %}
-        {% if filtered and keyword not in filtered %}
-        <li class="list-group-item">
-          <span class="badge">{{times}}</span>
-          <strong>{{keyword}}</strong>
-        </li>
-        {% endif %}
-      {% endfor %}
-    </ul>
-    </div>
-  {% endif %}
-{%- endmacro %}
-
-{% set result = workflow_object.extra_data.classifier_results.complete_output %}
-<div class="panel panel-primary">
-  <div class="panel-heading">
-    {{ _("Keyword extraction") }}
-  </div>
-  <div class="panel-body">
-    <div class="row">
-      {% if result.get("Core keywords") %}
-        <div class="col-md-4">
-          {{ display_keyword("CORE keywords (filtered)", result.get("Filtered Core keywords")) }}
-          <a class="toggle" data-toggle="collapse" href="#collapsed-keywords" aria-expanded="false" aria-controls="collapsed-keywords">
-            {{ _("Show/Hide more") }}
-          </a>
-        </div>
-        <div class="col-md-4">
-        {% if result.get("Core keywords", {})|count != result.get("Filtered Core keywords", {})|count %}
-          {{ display_core_keyword("Other CORE keywords", result.get("Core keywords", {}), result.get("Filtered Core keywords", {})) }}
-        {% endif %}
-        </div>
-        <div class="clearfix"></div>
-        <div class="collapse" id="collapsed-keywords">
-          <div class="col-md-4">
-            {{ display_keyword("Single keywords", result.get("Single keywords")) }}
-          </div>
-          <div class="col-md-4">
-            {{ display_composite_keyword("Composite keywords", result.get("Composite keywords")) }}
-          </div>
-          <div class="col-md-4">
-            {{ display_keyword("Author keywords", result.get("Author keywords")) }}
-          </div>
-          <div class="col-md-4">
-          {{ display_keyword("Acronyms", result.get("Acronyms")) }}
-          </div>
-          <div class="col-md-12">
-          {{ display_field_codes("Field codes", result.get("Field codes")) }}
-          </div>
-        </div>
-      {% else %}
-        <div class="col-md-12">
-          <p>{{ _("No CORE keywords found") }}.</p>
-        </div>
-      {% endif %}
-    </div>
-  </div>
-</div>
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/results/core_guessing.html b/inspirehep/modules/workflows/templates/inspire_workflows/results/core_guessing.html
deleted file mode 100644
index 6993046d..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/results/core_guessing.html
+++ /dev/null
@@ -1,58 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2015 CERN.
-#
-# INSPIRE is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% extends "workflows/results/results_base.html" %}
-
-{% block results_body %}
-
-  {% set result = results.get("result") %}
-  {% set overall_score = result.get("overall_score") %}
-  {% set top_words = result.get("top_words") %}
-  {% set core = result.get("core") %}
-  <div class="panel {% if core %}panel-success{% else %}panel-warning{% endif %}">
-    <div class="panel-heading">
-      {% if overall_score > 0%}
-        <span class="label label-success">CORE: {{ overall_score|round(2) }}</span>
-      {% else %}
-        <span class="label label-warning">Non-CORE: {{ overall_score|round(2) }}</span>
-      {% endif %}
-    </div>
-    <div class="panel-body">
-      <div class="row">
-      <div class="col-md-12">
-        <ul class="list-inline">
-        {% for type, term, score in top_words %}
-          <li>
-          {% if score > 0 %}
-            <span class="text-success">
-              {{ type }}:{{ term }}({{ score|round(2) }})
-            </span>
-          {% else %}
-            <span class="text-danger">
-              {{ type }}:{{ term }}({{ score|round(2) }})
-            </span>
-          {% endif %}
-          </li>
-        {% endfor %}
-        </ul>
-      </div>
-      </div>
-    </div>
-  </div>
-
-{% endblock %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record.html b/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record.html
deleted file mode 100644
index 7856ad45..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record.html
+++ /dev/null
@@ -1,70 +0,0 @@
-{#
-## This file is part of INSPIRE.
-## Copyright (C) 2014 CERN.
-##
-## INSPIRE is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## INSPIRE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% import 'inspire_workflows/macros.html' as macros %}
-{% if authors %}
-    {% for author in authors[0:10] %}
-      {% if author %}
-        <a class="greyfaded" href="https://inspirehep.net/search?p=find a {{author.full_name}}">
-          {{author.full_name}}
-        {%- if author != authors[-1] -%}
-        ;
-        {%- endif -%}
-      {%- endif -%}
-      </a>
-    {% endfor %}
-
-    {% if authors|count > 10 %}
-      et al.
-    {% endif %}
-{% endif %}
-
-{% if message %}
-<p class="lead">{{message}}</p>
-{% endif %}
-
-{% if categories %}
-<ul class="list-inline">
-  {% for category in categories %}
-    <li><h5><span class="label label-default">{{category}}</span></h5></li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-{% if identifiers %}
-<ul class="list-inline">
-  {% for identifier in identifiers %}
-  <li>
-    {% if 'arxiv' in identifier.lower() %}
-      {% set identifier_part = identifier.split(':')[-1] %}
-      <a href="http://arxiv.org/abs/{{identifier_part}}">{{identifier_part}}</a>
-      <a href="http://arxiv.org/pdf/{{identifier_part}}"><i class="fa fa-file-pdf-o"></i> PDF</a>
-    {% else %}
-      {{identifier}}
-    {% endif %}
-  </li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-{% if abstract %}
-<div class="collapse" id="collapsed-abstract-{{object.id}}">
-{{ abstract }}
-</div>
-<a class="faded toggle" data-toggle="collapse" href="#collapsed-abstract-{{object.id}}" aria-expanded="false" aria-controls="collapsed-abstract-{{object.id}}">Abstract </a>
-{% endif %}
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record_additional.html b/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record_additional.html
deleted file mode 100644
index 717fa982..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/styles/harvesting_record_additional.html
+++ /dev/null
@@ -1,55 +0,0 @@
-{#
-# This file is part of INSPIRE.
-# Copyright (C) 2015 CERN.
-#
-# INSPIRE is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of the
-# License, or (at your option) any later version.
-#
-# INSPIRE is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-# 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% import 'inspire_workflows/macros.html' as macros %}
-
-<div class="row">
-  <div class="col-md-12">
-    {% if decision is not none %}
-      <h4>
-        {% if decision == "CORE" %}
-          <span class="label label-success">
-            {{decision}} ({{ score|round(2) }})
-          </span>
-        {% elif decision == "Non-CORE" %}
-          <span class="label label-warning">
-            {{decision}} ({{ score|round(2) }})
-          </span>
-        {% elif decision == "Rejected" %}
-          <span class="label label-danger">
-            {{decision}} ({{ score|round(2) }})
-          </span>
-        {% endif %}
-      </h4>
-    {% endif %}
-    {% if keywords %}
-      <ul class="list-unstyled">
-        {% set core_words = keywords.get("Core keywords", {}) %}
-        {% set filtered_core = keywords.get("Filtered Core keywords", {}).keys() %}
-        <li>(CKW {{core_words|count}}, filtered {{filtered_core|count}})</li>
-        {% for term, frequency in core_words|dictsort(false, 'value')|reverse %}
-          <li>
-            <span class="text-success">
-              {{ term }}
-            </span>
-          </li>
-        {% endfor %}
-      </ul>
-    {% endif %}
-  </div>
-</div>
diff --git a/inspirehep/modules/workflows/templates/inspire_workflows/styles/submission_record.html b/inspirehep/modules/workflows/templates/inspire_workflows/styles/submission_record.html
deleted file mode 100644
index 32c867b2..00000000
--- a/inspirehep/modules/workflows/templates/inspire_workflows/styles/submission_record.html
+++ /dev/null
@@ -1,78 +0,0 @@
-{#
-## This file is part of INSPIRE.
-## Copyright (C) 2014 CERN.
-##
-## INSPIRE is free software; you can redistribute it and/or
-## modify it under the terms of the GNU General Public License as
-## published by the Free Software Foundation; either version 2 of the
-## License, or (at your option) any later version.
-##
-## INSPIRE is distributed in the hope that it will be useful, but
-## WITHOUT ANY WARRANTY; without even the implied warranty of
-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-## General Public License for more details.
-##
-## You should have received a copy of the GNU General Public License
-## along with INSPIRE; if not, write to the Free Software Foundation, Inc.,
-## 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
-#}
-{% import 'inspire_workflows/macros.html' as macros %}
-
-{% for author in authors[0:10] %}
-  {% if author %}
-    <a class="greyfaded" href="https://inspirehep.net/search?p=find a {{author.full_name}}">
-      {{author.full_name}}
-    {%- if author != authors[-1] -%}
-    ;
-    {%- endif -%}
-  {%- endif -%}
-  </a>
-{% endfor %}
-
-{% if authors|count > 10 %}
-  et al.
-{% endif %}
-
-{% if message %}
-<p class="lead">{{message}}</p>
-{% endif %}
-
-{% if categories %}
-<ul class="list-inline">
-  {% for category in categories %}
-    <li><h5><span class="label label-default">{{category}}</span></h5></li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-{% if identifiers %}
-<ul class="list-inline">
-  {% for identifier in identifiers %}
-      <li>
-      {% if 'arxiv' in identifier.lower() %}
-        {% set identifier_part = identifier.split(':')[-1] %}
-        <a href="http://arxiv.org/abs/{{identifier_part}}">{{identifier_part}}</a>
-        <a href="http://arxiv.org/pdf/{{identifier_part}}"><i class="fa fa-file-pdf-o"></i> PDF</a>
-      {% elif 'doi:' in identifier.lower() %}
-        {% set identifier_part = identifier.split(':')[-1] %}
-        <a href="http://dx.doi.org/{{identifier_part}}">{{identifier_part}}</a>
-      {% else %}
-        {{identifier}}
-      {% endif %}
-    </li>
-  {% endfor %}
-</ul>
-{% endif %}
-
-<p><i class="fa fa-user"></i> {{ user_email }}</p>
-
-{% if doctype %}
-<h5><span class="label label-default">{{doctype}}</span></h5>
-{% endif %}
-
-{% if record.abstracts %}
-<div class="collapse" id="collapsed-abstract-{{object.id}}">
-{{ record.abstracts[0]['value'] }}
-</div>
-<a class="faded toggle" data-toggle="collapse" href="#collapsed-abstract-{{object.id}}" aria-expanded="false" aria-controls="collapsed-abstract-{{object.id}}">Abstract </a>
-{% endif %}
diff --git a/tests/acceptance/test_author_creation.py b/tests/acceptance/test_author_creation.py
index 3463cd38..8afadf0a 100644
--- a/tests/acceptance/test_author_creation.py
+++ b/tests/acceptance/test_author_creation.py
@@ -49,10 +49,10 @@ INPUT_AUTHOR_DATA = {
     'experiments-start_year': '2002',
     'experiments-end_year': '2005',
     'advisors-name': 'Bob White',
-    'advisors-degree_type': 'PhD',
+    'advisors-degree_type': 'phd',
     'extra_comments': 'Some comments about the author',
-    'subject-0': 'ACC-PHYS',
-    'subject-1': 'ASTRO-PH'
+    'subject-0': 'astro-ph',
+    'subject-1': 'cond-mat'
 }
 
 
diff --git a/tests/unit/authors/test_authors_dojson.py b/tests/unit/authors/test_authors_dojson.py
index 33daf7b8..54bab5b0 100644
--- a/tests/unit/authors/test_authors_dojson.py
+++ b/tests/unit/authors/test_authors_dojson.py
@@ -398,12 +398,7 @@ def test_arxiv_categories_from_research_field():
         ('research_field', 'foo'),
     ])
 
-    expected = [
-        {
-            'source': 'user',
-            'term': 'foo',
-        },
-    ]
+    expected = 'foo'
     result = updateform.do(form)
 
     assert expected == result['arxiv_categories']
['inspirehep/modules/authors/dojson/fields/updateform.py', 'inspirehep/modules/workflows/static/js/inspire_workflows_ui/holdingpen/holdingpen.directives.js', 'inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_decision_authors.html', 'inspirehep/config.py', 'inspirehep/modules/authors/views/holdingpen.py', 'inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/results.html', 'tests/unit/authors/test_authors_dojson.py', 'inspirehep/modules/authors/forms.py', 'inspirehep/bat/pages/holding_panel_author_detail.py', 'inspirehep/bat/pages/holding_panel_author_list.py', 'inspirehep/modules/workflows/search.py', 'inspirehep/modules/workflows/static/js/inspire_workflows_ui/templates/details_subject_areas.html', 'inspirehep/modules/theme/static/scss/holding-pen/holding-pen.scss', 'tests/acceptance/test_author_creation.py']