diff --git a/docker/scripts/app-create-dirs.sh b/docker/scripts/app-create-dirs.sh
old mode 100644
new mode 100755
diff --git a/ietf/static/js/list.js b/ietf/static/js/list.js
index 63e2439799..ffc52d2aa7 100644
--- a/ietf/static/js/list.js
+++ b/ietf/static/js/list.js
@@ -25,7 +25,10 @@ function replace_with_internal(table, internal_table, i) {
 
 function field_magic(i, e, fields) {
     if ($(e)
-        .attr("colspan") === undefined && (fields[i] == "num" || fields[i] == "count" || fields[i] == "id")) {
+        .attr("colspan") === undefined &&
+        (fields[i] == "num" || fields[i] == "count" ||
+            fields[i] == "percent" || fields[i] == "id" ||
+            fields[i].endsWith("-num") || fields[i].endsWith("-date"))) {
         $(e)
             .addClass("text-end");
     }
@@ -276,4 +279,4 @@ $(document)
                 $(table)[0]
                     .dispatchEvent(new Event("tablesorter:done"));
             });
-    });
\ No newline at end of file
+    });
diff --git a/ietf/templates/debug.html b/ietf/templates/debug.html
index 446a2f5860..3eea27c195 100644
--- a/ietf/templates/debug.html
+++ b/ietf/templates/debug.html
@@ -17,11 +17,11 @@
                         <tr>
                             <th scope="col" data-sort="num">#</th>
                             <th scope="col" data-sort="query">SQL</th>
-                            <th scope="col" data-sort="num">Count</th>
+                            <th scope="col" data-sort="count">Count</th>
                             <th scope="col" data-sort="where">WHERE</th>
-                            <th scope="col" data-sort="num">View/Templ.</th>
-                            <th scope="col" data-sort="num">Time</th>
-                            <th scope="col" data-sort="num">Acc.</th>
+                            <th scope="col" data-sort="view-num">View/Templ.</th>
+                            <th scope="col" data-sort="time-num">Time</th>
+                            <th scope="col" data-sort="acc-num">Acc.</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -107,4 +107,4 @@ <h4 class="modal-title" id="modal-title-{{ forloop.counter }}">QuerySet Origin f
             Add <code>ietf.context_processors.sql_debug</code> to <code>settings.DEV_TEMPLATE_CONTEXT_PROCESSORS</code> to turn on the SQL statement table.
         </small>
     {% endif %}
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/group/review_requests.html b/ietf/templates/group/review_requests.html
index 7d75cf7193..83a96378be 100644
--- a/ietf/templates/group/review_requests.html
+++ b/ietf/templates/group/review_requests.html
@@ -22,10 +22,10 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
             <tr>
                 <th scope="col" data-sort="request">Request</th>
                 <th scope="col" data-sort="type">Type</th>
-                <th scope="col" data-sort="date">Requested</th>
-                <th scope="col" data-sort="date">Deadline</th>
+                <th scope="col" data-sort="req-date">Requested</th>
+                <th scope="col" data-sort="deadline-date">Deadline</th>
                 <th scope="col" data-sort="state">Document state</th>
-                <th scope="col" data-sort="date">IESG Telechat</th>
+                <th scope="col" data-sort="telechat-date">IESG Telechat</th>
             </tr>
         </thead>
             <tbody>
@@ -71,11 +71,11 @@ <h2 class="mt-5" id="unassigned-and-open-review-requests">Unassigned and open re
                     <tr>
                         <th scope="col" data-sort="request">Request</th>
                         <th scope="col" data-sort="type">Type</th>
-                        <th scope="col" data-sort="date">Requested</th>
-                        <th scope="col" data-sort="date">Deadline</th>
+                        <th scope="col" data-sort="req-date">Requested</th>
+                        <th scope="col" data-sort="deadline-date">Deadline</th>
                         <th scope="col" data-sort="reviewer">Reviewer</th>
                         <th scope="col" data-sort="state">Document state</th>
-                        <th scope="col" data-sort="date">IESG Telechat</th>
+                        <th scope="col" data-sort="telechat-date">IESG Telechat</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -133,13 +133,13 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                     <th scope="col" data-sort="type">
                         Type
                     </th>
-                    <th scope="col" data-sort="date">
+                    <th scope="col" data-sort="req-date">
                         Requested
                     </th>
-                    <th scope="col" data-sort="date">
+                    <th scope="col" data-sort="deadline-date">
                         Deadline
                     </th>
-                    <th scope="col" data-sort="date">
+                    <th scope="col" data-sort="closed-date">
                         Closed
                     </th>
                     <th scope="col" data-sort="state">
@@ -188,13 +188,13 @@ <h2 class="mt-5" id="closed-review-requests">Closed review requests and assignme
                         <th scope="col" data-sort="type">
                             Type
                         </th>
-                        <th scope="col" data-sort="date">
+                        <th scope="col" data-sort="assgn-date">
                             Assigned
                         </th>
-                        <th scope="col" data-sort="date">
+                        <th scope="col" data-sort="deadline-date">
                             Deadline
                         </th>
-                        <th scope="col" data-sort="date">
+                        <th scope="col" data-sort="closed-date">
                             Closed
                         </th>
                         <th scope="col" data-sort="reviewer">
diff --git a/ietf/templates/liaisons/liaison_table.html b/ietf/templates/liaisons/liaison_table.html
index 3fe439ef07..59b78eaa97 100644
--- a/ietf/templates/liaisons/liaison_table.html
+++ b/ietf/templates/liaisons/liaison_table.html
@@ -6,7 +6,7 @@
             <th scope="col" data-sort="date">Date</th>
             <th scope="col" data-sort="from">From</th>
             <th scope="col" class="d-none d-sm-table-cell" data-sort="to">To</th>
-            <th scope="col" class="d-none d-sm-table-cell" data-sort="date">Deadline</th>
+            <th scope="col" class="d-none d-sm-table-cell" data-sort="deadline-date">Deadline</th>
             <th scope="col" data-sort="title">Title</th>
         </tr>
     </thead>
@@ -36,4 +36,4 @@
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/meeting/requests.html b/ietf/templates/meeting/requests.html
index 86b8c26f97..c2cbcc2561 100644
--- a/ietf/templates/meeting/requests.html
+++ b/ietf/templates/meeting/requests.html
@@ -30,7 +30,7 @@ <h2 class="mt-5" id="{{ area.grouper.acronym }}">
             <thead>
                 <tr>
                     <th scope="col" data-sort="group">Group</th>
-                    <th scope="col" data-sort="num">Length</th>
+                    <th scope="col" data-sort="count">Length</th>
                     <th scope="col" data-sort="num">Size</th>
                     <th scope="col" class="d-none d-sm-table-cell" data-sort="requester">Requester</th>
                     <th scope="col" class="d-none d-sm-table-cell" data-sort="ad">AD</th>
diff --git a/ietf/templates/nomcom/private_index.html b/ietf/templates/nomcom/private_index.html
index f509872b82..831ea5e917 100644
--- a/ietf/templates/nomcom/private_index.html
+++ b/ietf/templates/nomcom/private_index.html
@@ -13,15 +13,15 @@ <h2 class="mt-3">Nomination status</h2>
             <tr>
                 <th scope="col" data-sort="position">Position</th>
                 <th scope="col" data-sort="open">Open</th>
-                <th scope="col" data-sort="accepting">Accepting nominations</th>
-                <th scope="col" data-sort="accepting">Accepting feedback</th>
-                <th scope="col" data-sort="num">Nominations</th>
-                <th scope="col" data-sort="num">Unique nominees</th>
-                <th scope="col" data-sort="num">Accepted</th>
-                <th scope="col" data-sort="num">Declined</th>
-                <th scope="col" data-sort="num">Pending</th>
-                <th scope="col" data-sort="num">Questionnaire responses</th>
-                <th scope="col" data-sort="num">Comments</th>
+                <th scope="col" data-sort="accepting-nom-num">Accepting nominations</th>
+                <th scope="col" data-sort="accepting-fb-num">Accepting feedback</th>
+                <th scope="col" data-sort="nom-num">Nominations</th>
+                <th scope="col" data-sort="uniq-num">Unique nominees</th>
+                <th scope="col" data-sort="acc-num">Accepted</th>
+                <th scope="col" data-sort="decl-num">Declined</th>
+                <th scope="col" data-sort="pend-num">Pending</th>
+                <th scope="col" data-sort="resp-num">Questionnaire responses</th>
+                <th scope="col" data-sort="comm-num">Comments</th>
             </tr>
         </thead>
         {% if stats %}
@@ -246,4 +246,4 @@ <h2 class="mt-3">
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/nomcom/view_feedback.html b/ietf/templates/nomcom/view_feedback.html
index 3957b7c129..925d281f70 100644
--- a/ietf/templates/nomcom/view_feedback.html
+++ b/ietf/templates/nomcom/view_feedback.html
@@ -24,7 +24,7 @@ <h3 class="mt-5" id="declined">Declined each nominated position</h3>
                     <th scope="col" data-sort="first">First name</th>
                     <th scope="col" data-sort="last">Last name</th>
                     <th scope="col" data-sort="email">Email</th>
-                    {% for ft in nominee_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
+                    {% for ft in nominee_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
                 </tr>
             </thead>
             <tbody>
@@ -61,7 +61,7 @@ <h2 class="mt-5" id="topics">Feedback related to topics</h2>
         <thead>
             <tr>
                 <th scope="col" data-sort="topic">Topic</th>
-                {% for ft in topic_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
+                {% for ft in topic_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
             </tr>
         </thead>
         <tbody>
@@ -88,7 +88,7 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
             <thead>
                 <tr>
                     <th scope="col"></th>
-                    {% for ft in independent_feedback_types %}<th scope="col" data-sort="num">{{ ft.name }}</th>{% endfor %}
+                    {% for ft in independent_feedback_types %}<th scope="col" data-sort="{{ ft.name|slugify }}-num">{{ ft.name }}</th>{% endfor %}
                 </tr>
             </thead>
             <tbody>
@@ -104,4 +104,4 @@ <h2 class="mt-5" id="misc">Feedback not related to Nominees</h2>
 {% endblock %}
 {% block js %}
     <script src="{% static "ietf/js/list.js" %}"></script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/person/profile.html b/ietf/templates/person/profile.html
index e17a2a5e7d..e13f66ce28 100644
--- a/ietf/templates/person/profile.html
+++ b/ietf/templates/person/profile.html
@@ -85,7 +85,7 @@ <h2 class="mt-5" id="rfcs">
                     <th scope="col" data-sort="rfc">RFC</th>
                     <th scope="col" data-sort="date">Date</th>
                     <th scope="col" data-sort="title">Title</th>
-                    <th scope="col" data-sort="title">Cited by</th>
+                    <th scope="col" data-sort="citedby">Cited by</th>
                 </thead>
                 <tbody>
                     {% for doc in person.rfcs  %}
@@ -172,4 +172,4 @@ <h2 class="mt-5">
                 });
             });
     </script>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/ietf/templates/stats/document_stats_author_affiliation.html b/ietf/templates/stats/document_stats_author_affiliation.html
index e94fda89f7..aecdb0ba39 100644
--- a/ietf/templates/stats/document_stats_author_affiliation.html
+++ b/ietf/templates/stats/document_stats_author_affiliation.html
@@ -45,8 +45,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="affiliation">Affiliation</th>
-            <th scope="col" data-sort="num">Percentage of authors</th>
-            <th scope="col" data-sort="num">Authors</th>
+            <th scope="col" data-sort="percent">Percentage of authors</th>
+            <th scope="col" data-sort="count">Authors</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -110,4 +110,4 @@ <h2>Affiliation Aliases</h2>
     <p>
         <a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
     </p>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/stats/document_stats_author_citations.html b/ietf/templates/stats/document_stats_author_citations.html
index 4bf1fdf2fb..ae89335fae 100644
--- a/ietf/templates/stats/document_stats_author_citations.html
+++ b/ietf/templates/stats/document_stats_author_citations.html
@@ -52,7 +52,7 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="num">Citations</th>
-            <th scope="col" data-sort="num">Percentage of authors</th>
+            <th scope="col" data-sort="percent">Percentage of authors</th>
             <th scope="col" data-sort="authors">Authors</th>
         </tr>
     </thead>
@@ -69,4 +69,4 @@ <h2>Data</h2>
     {% endif %}
 </table>
 
-<p>Note that the citation counts do not exclude self-references.</p>
\ No newline at end of file
+<p>Note that the citation counts do not exclude self-references.</p>
diff --git a/ietf/templates/stats/document_stats_author_continent.html b/ietf/templates/stats/document_stats_author_continent.html
index 852b9afa8a..805d61dab2 100644
--- a/ietf/templates/stats/document_stats_author_continent.html
+++ b/ietf/templates/stats/document_stats_author_continent.html
@@ -45,8 +45,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="continent">Continent</th>
-            <th scope="col" data-sort="num">Percentage of authors</th>
-            <th scope="col" data-sort="num">Authors</th>
+            <th scope="col" data-sort="percent">Percentage of authors</th>
+            <th scope="col" data-sort="count">Authors</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -66,4 +66,4 @@ <h2>Data</h2>
     with each draft. Since this varies across documents, a traveling
     author may be counted in more than country, making the total sum
     more than 100%.
-</p>
\ No newline at end of file
+</p>
diff --git a/ietf/templates/stats/document_stats_author_country.html b/ietf/templates/stats/document_stats_author_country.html
index 726e70a740..724ed74bd5 100644
--- a/ietf/templates/stats/document_stats_author_country.html
+++ b/ietf/templates/stats/document_stats_author_country.html
@@ -45,7 +45,7 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="country">Country</th>
-            <th scope="col" class="text-end" data-sort="percentage">Percentage of authors</th>
+            <th scope="col" class="text-end" data-sort="percent">Percentage of authors</th>
             <th scope="col" class="text-end" data-sort="authors">Authors</th>
         </tr>
     </thead>
@@ -133,4 +133,4 @@ <h2>Country Aliases</h2>
     <p>
         <a href="{{ show_aliases_url }}" class="btn btn-primary">Show generated aliases</a>
     </p>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/stats/document_stats_author_documents.html b/ietf/templates/stats/document_stats_author_documents.html
index 0540f09f34..28e33e6737 100644
--- a/ietf/templates/stats/document_stats_author_documents.html
+++ b/ietf/templates/stats/document_stats_author_documents.html
@@ -51,8 +51,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="num">Documents</th>
-            <th scope="col" data-sort="num">Percentage of authors</th>
-            <th scope="col" data-sort="num">Authors</th>
+            <th scope="col" data-sort="percent">Percentage of authors</th>
+            <th scope="col" data-sort="count">Authors</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -66,4 +66,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/document_stats_author_hindex.html b/ietf/templates/stats/document_stats_author_hindex.html
index b2e03682ce..ab3215d355 100644
--- a/ietf/templates/stats/document_stats_author_hindex.html
+++ b/ietf/templates/stats/document_stats_author_hindex.html
@@ -50,7 +50,7 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="num">h-index</th>
-            <th scope="col" data-sort="num">Percentage of authors</th>
+            <th scope="col" data-sort="percent">Percentage of authors</th>
             <th scope="col" data-sort="Authors">Authors</th>
         </tr>
     </thead>
@@ -80,4 +80,4 @@ <h2>Data</h2>
 </p>
 <p>
     Note that the h-index calculations do not exclude self-references.
-</p>
\ No newline at end of file
+</p>
diff --git a/ietf/templates/stats/document_stats_authors.html b/ietf/templates/stats/document_stats_authors.html
index 19bb495075..5c1bbbdf4c 100644
--- a/ietf/templates/stats/document_stats_authors.html
+++ b/ietf/templates/stats/document_stats_authors.html
@@ -50,8 +50,8 @@ <h3>Data</h3>
     <thead>
         <tr>
             <th scope="col" data-sort="num">Authors</th>
-            <th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
+            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
+            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -65,4 +65,4 @@ <h3>Data</h3>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/document_stats_format.html b/ietf/templates/stats/document_stats_format.html
index b6578ffd86..ba73f1e41e 100644
--- a/ietf/templates/stats/document_stats_format.html
+++ b/ietf/templates/stats/document_stats_format.html
@@ -46,7 +46,7 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="format">Format</th>
-            <th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
+            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
             <th scope="col" data-sort="label">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
@@ -61,4 +61,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/document_stats_formlang.html b/ietf/templates/stats/document_stats_formlang.html
index 33b9a3174f..07da7ce170 100644
--- a/ietf/templates/stats/document_stats_formlang.html
+++ b/ietf/templates/stats/document_stats_formlang.html
@@ -46,8 +46,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="formal">Formal language</th>
-            <th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
+            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
+            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -61,4 +61,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/document_stats_pages.html b/ietf/templates/stats/document_stats_pages.html
index e74fab937b..73231b0e90 100644
--- a/ietf/templates/stats/document_stats_pages.html
+++ b/ietf/templates/stats/document_stats_pages.html
@@ -44,8 +44,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="num">Pages</th>
-            <th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
+            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
+            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -59,4 +59,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/document_stats_words.html b/ietf/templates/stats/document_stats_words.html
index ec992f1e91..4e8c15e937 100644
--- a/ietf/templates/stats/document_stats_words.html
+++ b/ietf/templates/stats/document_stats_words.html
@@ -44,8 +44,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="num">Words</th>
-            <th scope="col" data-sort="num">Percentage of {{ doc_label }}s</th>
-            <th scope="col" data-sort="num">{{ doc_label|capfirst }}s</th>
+            <th scope="col" data-sort="percent">Percentage of {{ doc_label }}s</th>
+            <th scope="col" data-sort="count">{{ doc_label|capfirst }}s</th>
         </tr>
     </thead>
     {% if table_data %}
@@ -59,4 +59,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     {% endif %}
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/meeting_stats_continent.html b/ietf/templates/stats/meeting_stats_continent.html
index 43f20c15f0..42ca03a409 100644
--- a/ietf/templates/stats/meeting_stats_continent.html
+++ b/ietf/templates/stats/meeting_stats_continent.html
@@ -45,8 +45,8 @@ <h2>Data</h2>
     <thead>
         <tr>
             <th scope="col" data-sort="continent">Continent</th>
-            <th scope="col" data-sort="num">Percentage of attendees</th>
-            <th scope="col" data-sort="num">Attendees</th>
+            <th scope="col" data-sort="percent">Percentage of attendees</th>
+            <th scope="col" data-sort="count">Attendees</th>
         </tr>
     </thead>
     <tbody>
@@ -58,4 +58,4 @@ <h2>Data</h2>
             </tr>
         {% endfor %}
     </tbody>
-</table>
\ No newline at end of file
+</table>
diff --git a/ietf/templates/stats/meeting_stats_overview.html b/ietf/templates/stats/meeting_stats_overview.html
index 9a3b5dc6a6..1136e458b8 100644
--- a/ietf/templates/stats/meeting_stats_overview.html
+++ b/ietf/templates/stats/meeting_stats_overview.html
@@ -128,7 +128,7 @@ <h2>Data</h2>
                 <th scope="col" data-sort="city">City</th>
                 <th scope="col" data-sort="country">Country</th>
                 <th scope="col" data-sort="continent">Continent</th>
-                <th scope="col" data-sort="num">Attendees</th>
+                <th scope="col" data-sort="count">Attendees</th>
             </tr>
         </thead>
         <tbody>
@@ -157,4 +157,4 @@ <h2>Data</h2>
             {% endfor %}
         </tbody>
     </table>
-{% endif %}
\ No newline at end of file
+{% endif %}
diff --git a/ietf/templates/stats/review_stats.html b/ietf/templates/stats/review_stats.html
index 41564ead79..dce6544d5c 100644
--- a/ietf/templates/stats/review_stats.html
+++ b/ietf/templates/stats/review_stats.html
@@ -150,19 +150,19 @@ <h2>Completion status and completion time</h2>
                         Reviewer
                     {% endif %}
                 </th>
-                <th scope="col" data-sort="num"
+                <th scope="col" data-sort="req-num"
                     title="Requests that are currently requested or accepted by reviewer">Open in time</th>
-                <th scope="col" data-sort="num"
+                <th scope="col" data-sort="past-num"
                     title="Requests that are currently requested or accepted by reviewer and past the deadline">
                     Open late
                 </th>
-                <th scope="col" data-sort="num"
+                <th scope="col" data-sort="comp-num"
                     title="Requests that have been completed partially or completely">Completed in time</th>
-                <th scope="col" data-sort="num"
+                <th scope="col" data-sort="comppast-num"
                     title="Requests that have been completed partially or completely past the deadline">
                     Completed late
                 </th>
-                <th scope="col" data-sort="num"
+                <th scope="col" data-sort="rej-num"
                     title="Requests that are rejected by the reviewer, withdrawn, overtaken by events or with no response from reviewer">
                     Not completed
                 </th>
@@ -211,7 +211,7 @@ <h2>
                         {% endif %}
                     </th>
                     {% for r in results %}
-                        <th scope="col" data-sort="num">
+                        <th scope="col" data-sort="{{ r.name|slugify }}-num">
                             {{ r.name }}
                         </th>
                     {% endfor %}
@@ -248,7 +248,7 @@ <h2>
                         {% endif %}
                     </th>
                     {% for s in states %}
-                        <th scope="col" data-sort="num">
+                        <th scope="col" data-sort="{{ s.name|slugify }}-num">
                             {{ s.name }}
                         </th>
                     {% endfor %}
diff --git a/package-lock.json b/package-lock.json
index 30894d5ce3..153fc15ec0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,5 +1,5 @@
 {
-  "name": "datatracker",
+  "name": "workspace",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {