diff --git a/webtool/templates/components/result-status.html b/webtool/templates/components/result-status.html
index 15a741fa4..b910d675a 100644
--- a/webtool/templates/components/result-status.html
+++ b/webtool/templates/components/result-status.html
@@ -1,13 +1,10 @@
-{% if not dataset.is_finished() %}
-    {% if dataset.queue_position >= 0 %}
-        {% if not no_icons %}<i class="fas fa-hourglass-half" aria-label="Query in progress..."></i>{% endif %} In a queue{% if dataset.queue_position > 0 %}
-          (waiting for {{ dataset.queue_position }} dataset{% if dataset.queue_position != 1 %}s{% endif %} to finish).
-        {% else %}, waiting for other datasets to finish...{% endif %}
-    {% else %}
+{% if not dataset.is_finished() and dataset.queue_position > 0 %}
+    {% if not no_icons %}<i class="fas fa-hourglass-half" aria-label="Query in progress..."></i>{% endif %} In a queue{% if dataset.queue_position > 0 %}
+        (waiting for {{ dataset.queue_position }} dataset{% if dataset.queue_position != 1 %}s{% endif %} to finish).
+    {% else %}, waiting for job to be started...{% endif %}
+{% elif not dataset.is_finished() %}
         {% if not no_icons %}<i class="fas fa-arrow-down scroll" aria-label="Query in progress..."></i>{% endif %}
-    {% endif %}
-{% endif %}
-{% if dataset.is_finished() and not no_icons %}
+{% elif dataset.is_finished() and not no_icons %}
     {% if dataset.num_rows == 0 %}
         <i class="fa fa-skull" aria-hidden="true"></i> <em>No results.</em>
     {% elif dataset.num_rows < 0 %}
@@ -17,10 +14,10 @@
     {% endif %}
 {% endif %}
 {% if dataset.queue_position <= 0 %}
-{% if dataset.get_status() %}
-    {{ dataset.get_status() }}{% if dataset.get_status()[-1] != '.' %}.{% endif %}
-{% endif %}
-{% if dataset.is_finished() and dataset.num_rows > 0 %}
-    {{ dataset.num_rows|commafy }} item{% if dataset.num_rows != 1 %}s{% endif %} captured.
-{% endif %}
+    {% if dataset.get_status() %}
+        {{ dataset.get_status() }}{% if dataset.get_status()[-1] != '.' %}.{% endif %}
+    {% endif %}
+    {% if dataset.is_finished() and dataset.num_rows > 0 %}
+        {{ dataset.num_rows|commafy }} item{% if dataset.num_rows != 1 %}s{% endif %} captured.
+    {% endif %}
 {% endif %}