diff --git a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
index 94c10d0dea..b3c91f3bd5 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_horizontal.html
@@ -14,7 +14,7 @@
                 {% for object_navigation_links in resolved_links %}
                     {% include 'navigation/generic_navigation.html' %}
                 {% empty %}
-                    <p class="text-center" colspan=99>
+                    <p class="text-center">
                         {% include 'appearance/no_results.html' %}
                     </p>
                 {% endfor %}
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
index a8559717b4..8386f9d7f9 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_items_subtemplate.html
@@ -6,110 +6,112 @@
 
 <div class="row">
     <div class="col-xs-12">
-        <h4>
-            {% if page_obj %}
-                {% if page_obj.paginator.num_pages != 1 %}
-                    {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
-                {% else %}
-                    {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
-                {% endif %}
-            {% else %}
-                {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
-            {% endif %}
-        </h4>
-        <hr>
-        <div class="well center-block">
-            <div class="clearfix">
-                <div class="pull-right">
-                    <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
-                        {% if object_list %}
-                            {% if not hide_multi_item_actions %}
-                                {% get_multi_item_links_form object_list %}
-                            {% endif %}
-                            {% if multi_item_actions %}
-                                <fieldset style="margin-top: -10px;">
-                                    <input class="check-all" type="checkbox"/>&nbsp;
-                                    {{ multi_item_form }}
-                                </fieldset>
-                            {% endif %}
-                        {% endif %}
-                    </form>
-                </div>
+        {% if not object_list %}
+            <div class="well">
+                {% include 'appearance/no_results.html' %}
             </div>
+        {% else %}
 
-            {% if object_list %}
-                <hr style="border-bottom: 1px solid lightgrey;">
-            {% endif %}
+            <h4>
+                {% if page_obj %}
+                    {% if page_obj.paginator.num_pages != 1 %}
+                        {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
+                    {% else %}
+                        {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                    {% endif %}
+                {% else %}
+                    {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                {% endif %}
+            </h4>
+            <hr>
+            <div class="well center-block">
+                <div class="clearfix">
+                    <div class="pull-right">
+                        <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
+                            {% if object_list %}
+                                {% if not hide_multi_item_actions %}
+                                    {% get_multi_item_links_form object_list %}
+                                {% endif %}
+                                {% if multi_item_actions %}
+                                    <fieldset style="margin-top: -10px;">
+                                        <input class="check-all" type="checkbox"/>&nbsp;
+                                        {{ multi_item_form }}
+                                    </fieldset>
+                                {% endif %}
+                            {% endif %}
+                        </form>
+                    </div>
+                </div>
 
-            <div class="row row-items">
-                {% for object in object_list %}
-                    <div class="{{ column_class|default:'col-xs-12 col-sm-4 col-md-3 col-lg-2' }}">
-                        <div class="panel panel-primary panel-item">
-                            <div class="panel-heading">
-                                <div class="form-group">
-                                    <div class="checkbox">
-                                        <label for="id_indexes_0">
-                                            {% if multi_item_actions %}
-                                                {% if multi_select_item_properties %}
-                                                    <input class="form-multi-object-action-checkbox check-all-slave checkbox" type="checkbox" name="properties_{{ object|get_encoded_parameter:multi_select_item_properties }}" />
-                                                {% else %}
-                                                    <input class="form-multi-object-action-checkbox check-all-slave checkbox" type="checkbox" name="pk_{{ object.pk }}" />
-                                                {% endif %}
-                                            {% endif %}
+                {% if object_list %}
+                    <hr style="border-bottom: 1px solid lightgrey;">
+                {% endif %}
 
-                                            <span style="color: white; word-break: break-all; overflow-wrap: break-word;">
-                                                {% if not hide_object %}
-                                                    {% if main_object %}
-                                                        {% with object|object_property:main_object as object %}
-                                                            {% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}
-                                                        {% endwith %}
+                <div class="row row-items">
+                    {% for object in object_list %}
+                        <div class="{{ column_class|default:'col-xs-12 col-sm-4 col-md-3 col-lg-2' }}">
+                            <div class="panel panel-primary panel-item">
+                                <div class="panel-heading">
+                                    <div class="form-group">
+                                        <div class="checkbox">
+                                            <label for="id_indexes_0">
+                                                {% if multi_item_actions %}
+                                                    {% if multi_select_item_properties %}
+                                                        <input class="form-multi-object-action-checkbox check-all-slave checkbox" type="checkbox" name="properties_{{ object|get_encoded_parameter:multi_select_item_properties }}" />
                                                     {% else %}
-                                                        {% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}
+                                                        <input class="form-multi-object-action-checkbox check-all-slave checkbox" type="checkbox" name="pk_{{ object.pk }}" />
                                                     {% endif %}
                                                 {% endif %}
 
-                                            </span>
-                                        </label>
+                                                <span style="color: white; word-break: break-all; overflow-wrap: break-word;">
+                                                    {% if not hide_object %}
+                                                        {% if main_object %}
+                                                            {% with object|object_property:main_object as object %}
+                                                                {% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}
+                                                            {% endwith %}
+                                                        {% else %}
+                                                            {% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}
+                                                        {% endif %}
+                                                    {% endif %}
+
+                                                </span>
+                                            </label>
+                                        </div>
                                     </div>
+
                                 </div>
+                                <div class="panel-body">
 
-                            </div>
-                            <div class="panel-body">
-
-                                {% if not hide_columns %}
-                                    {% for column in object|get_source_columns %}
-                                        <div class="text-center" style="">{% source_column_resolve column=column %}{{ column_result }}</div>
-                                    {% endfor %}
-                                {% endif %}
-
-                                {% for column in extra_columns %}
-                                    <div class="text-center"><span class="list-extra-column-label">{{ column.name }}</span>: {{ object|object_property:column.attribute }}</div>
-                                {% endfor %}
-
-                                {% if not hide_links %}
-                                    <p class="text-center">
-                                        {% get_menu_links 'object menu' source=object as resolved_links %}
-                                        {% for object_navigation_links in resolved_links %}
-                                            {% with 'true' as as_dropdown %}
-                                                {% include 'navigation/generic_navigation.html' %}
-                                            {% endwith %}
+                                    {% if not hide_columns %}
+                                        {% for column in object|get_source_columns %}
+                                            <div class="text-center" style="">{% source_column_resolve column=column %}{{ column_result }}</div>
                                         {% endfor %}
-                                    </p>
-                                {% endif %}
+                                    {% endif %}
 
+                                    {% for column in extra_columns %}
+                                        <div class="text-center"><span class="list-extra-column-label">{{ column.name }}</span>: {{ object|object_property:column.attribute }}</div>
+                                    {% endfor %}
+
+                                    {% if not hide_links %}
+                                        <p class="text-center">
+                                            {% get_menu_links 'object menu' source=object as resolved_links %}
+                                            {% for object_navigation_links in resolved_links %}
+                                                {% with 'true' as as_dropdown %}
+                                                    {% include 'navigation/generic_navigation.html' %}
+                                                {% endwith %}
+                                            {% endfor %}
+                                        </p>
+                                    {% endif %}
+
+                                </div>
                             </div>
                         </div>
-                    </div>
-                {% empty %}
-                    <div class="col-xs-12">
-                        {% include 'appearance/no_results.html' %}
-                    </div>
+                    {% endfor %}
+                </div>
 
-                {% endfor %}
+                {% include 'pagination/pagination.html' %}
             </div>
-
-            {% include 'pagination/pagination.html' %}
-        </div>
+        {% endif %}
     </div>
 </div>
 
diff --git a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
index 8e84743df2..07a67d0085 100644
--- a/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
+++ b/mayan/apps/appearance/templates/appearance/generic_list_subtemplate.html
@@ -6,126 +6,124 @@
 
 <div class="row">
     <div class="col-xs-12">
-        <h4>
-            {% if page_obj %}
-                {% if page_obj.paginator.num_pages != 1 %}
-                    {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
+        {% if not object_list %}
+            <div class="well center-block">
+                {% include 'appearance/no_results.html' %}
+            </div>
+        {% else %}
+            <h4>
+                {% if page_obj %}
+                    {% if page_obj.paginator.num_pages != 1 %}
+                        {% blocktrans with page_obj.start_index as start and page_obj.end_index as end and page_obj.paginator.object_list|length as total and page_obj.number as page_number and page_obj.paginator.num_pages as total_pages %}Total ({{ start }} - {{ end }} out of {{ total }}) (Page {{ page_number }} of {{ total_pages }}){% endblocktrans %}
+                    {% else %}
+                        {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                    {% endif %}
                 {% else %}
-                    {% blocktrans with page_obj.paginator.object_list|length as total %}Total: {{ total }}{% endblocktrans %}
+                    {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
                 {% endif %}
-            {% else %}
-                {% blocktrans with object_list|length as total %}Total: {{ total }}{% endblocktrans %}
-            {% endif %}
-        </h4>
-        <hr>
+            </h4>
+            <hr>
 
-        <div class="well center-block">
-            <div class="clearfix">
-                <div class="pull-right">
-                    <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
-                        {% if object_list %}
-                            {% if not hide_multi_item_actions %}
-                                {% get_multi_item_links_form object_list %}
-                            {% endif %}
-                            {% if multi_item_actions %}
-                                <fieldset style="margin-top: -10px; margin-bottom: 10px;">
-                                    {{ multi_item_form }}
-                                </fieldset>
-                            {% endif %}
-                        {% endif %}
-                    </form>
-                </div>
-            </div>
-
-            <div class="table-responsive">
-                <table class="table table-condensed table-striped">
-                    <tbody>
-                        {% if not hide_header %}
-                            <tr>
+            <div class="well center-block">
+                <div class="clearfix">
+                    <div class="pull-right">
+                        <form action="{% url 'common:multi_object_action_view' %}" class="form-multi-object-action" method="get">
+                            {% if object_list %}
+                                {% if not hide_multi_item_actions %}
+                                    {% get_multi_item_links_form object_list %}
+                                {% endif %}
                                 {% if multi_item_actions %}
-                                    <th class="first"><input class="checkbox check-all" type="checkbox" /></th>
+                                    <fieldset style="margin-top: -10px; margin-bottom: 10px;">
+                                        {{ multi_item_form }}
+                                    </fieldset>
                                 {% endif %}
+                            {% endif %}
+                        </form>
+                    </div>
+                </div>
 
+                <div class="table-responsive">
+                    <table class="table table-condensed table-striped">
+                        <tbody>
+                            {% if not hide_header %}
+                                <tr>
+                                    {% if multi_item_actions %}
+                                        <th class="first"><input class="checkbox check-all" type="checkbox" /></th>
+                                    {% endif %}
+
+                                    {% if not hide_object %}
+                                        <th>{% trans 'Identifier' %}</th>
+                                    {% endif %}
+
+                                    {% if not hide_columns %}
+                                        {% for column in object_list|get_source_columns %}
+                                            <th>{{ column.label }}</th>
+                                        {% endfor %}
+                                    {% endif %}
+
+                                    {% for column in extra_columns %}
+                                        <th>{{ column.name }}</th>
+                                    {% endfor %}
+
+                                    {% if not hide_links %}
+                                        <th class="">&nbsp;</th>
+                                    {% endif %}
+                                </tr>
+                            {% endif %}
+                            {% for object in object_list %}
+                                <tr>
+                                {% if multi_item_actions %}
+                                    <td>
+                                    {% if multi_select_item_properties %}
+                                        <input type="checkbox" class="form-multi-object-action-checkbox check-all-slave checkbox" name="properties_{{ object|get_encoded_parameter:multi_select_item_properties }}" value="" />
+                                    {% else %}
+                                        <input type="checkbox" class="form-multi-object-action-checkbox check-all-slave checkbox" name="pk_{{ object.pk }}" value="" />
+                                    {% endif %}
+                                    </td>
+                                {% endif %}
                                 {% if not hide_object %}
-                                    <th>{% trans 'Identifier' %}</th>
-                                {% endif %}
-
-                                {% if not hide_columns %}
-                                    {% for column in object_list|get_source_columns %}
-                                        <th>{{ column.label }}</th>
-                                    {% endfor %}
-                                {% endif %}
-
-                                {% for column in extra_columns %}
-                                    <th>{{ column.name }}</th>
-                                {% endfor %}
-
-                                {% if not hide_links %}
-                                    <th class="">&nbsp;</th>
-                                {% endif %}
-                            </tr>
-                        {% endif %}
-                        {% for object in object_list %}
-                            <tr>
-
-                            {% if multi_item_actions %}
-                                <td>
-                                {% if multi_select_item_properties %}
-                                    <input type="checkbox" class="form-multi-object-action-checkbox check-all-slave checkbox" name="properties_{{ object|get_encoded_parameter:multi_select_item_properties }}" value="" />
-                                {% else %}
-                                    <input type="checkbox" class="form-multi-object-action-checkbox check-all-slave checkbox" name="pk_{{ object.pk }}" value="" />
-                                {% endif %}
-                                </td>
-                            {% endif %}
-                            {% if not hide_object %}
-                                {% if main_object %}
-                                    {% with object|object_property:main_object as object %}
+                                    {% if main_object %}
+                                        {% with object|object_property:main_object as object %}
+                                            <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
+                                        {% endwith %}
+                                    {% else %}
                                         <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
-                                    {% endwith %}
-                                {% else %}
-                                    <td>{% if not hide_link %}<a href="{{ object.get_absolute_url }}">{{ object }}</a>{% else %}{{ object }}{% endif %}</td>
+                                    {% endif %}
                                 {% endif %}
-                            {% endif %}
-                             {% if not hide_columns %}
-                                {% for column in object|get_source_columns %}
-                                    <td>{% source_column_resolve column=column %}{{ column_result }}</td>
+                                 {% if not hide_columns %}
+                                    {% for column in object|get_source_columns %}
+                                        <td>{% source_column_resolve column=column %}{{ column_result }}</td>
+                                    {% endfor %}
+                                {% endif %}
+                                {% for column in extra_columns %}
+                                    <td>{{ object|object_property:column.attribute }}</td>
                                 {% endfor %}
-                            {% endif %}
-                            {% for column in extra_columns %}
-                                <td>{{ object|object_property:column.attribute }}</td>
-                            {% endfor %}
-                            {% if not hide_links %}
-                                <td class="last">
-                                    {% get_menu_links 'object list facet' sort_results=True source=object as resolved_links %}
-                                    {% for object_navigation_links in resolved_links %}
-                                        {% with 'true' as horizontal %}
-                                        {% with 'true' as hide_icon %}
-                                            {% include 'navigation/generic_navigation.html' %}
-                                        {% endwith %}
-                                        {% endwith %}
-                                    {% endfor %}
-                                    {% get_menu_links 'object menu' source=object as resolved_links %}
-                                    {% for object_navigation_links in resolved_links %}
-                                        {% with 'true' as horizontal %}
-                                        {% with 'true' as hide_icon %}
-                                            {% include 'navigation/generic_navigation.html' %}
-                                        {% endwith %}
-                                        {% endwith %}
-                                    {% endfor %}
-                                </td>
-                            {% endif %}
-                            </tr>
-                        {% empty %}
-                            <tr>
-                                <td class="text-center" colspan=99>
-                                    {% include 'appearance/no_results.html' %}
-                                </td>
-                            </tr>
-                        {% endfor %}
-                    </tbody>
-                </table>
+                                {% if not hide_links %}
+                                    <td class="last">
+                                        {% get_menu_links 'object list facet' sort_results=True source=object as resolved_links %}
+                                        {% for object_navigation_links in resolved_links %}
+                                            {% with 'true' as horizontal %}
+                                            {% with 'true' as hide_icon %}
+                                                {% include 'navigation/generic_navigation.html' %}
+                                            {% endwith %}
+                                            {% endwith %}
+                                        {% endfor %}
+                                        {% get_menu_links 'object menu' source=object as resolved_links %}
+                                        {% for object_navigation_links in resolved_links %}
+                                            {% with 'true' as horizontal %}
+                                            {% with 'true' as hide_icon %}
+                                                {% include 'navigation/generic_navigation.html' %}
+                                            {% endwith %}
+                                            {% endwith %}
+                                        {% endfor %}
+                                    </td>
+                                {% endif %}
+                                </tr>
+                        </tbody>
+                    </table>
+                </div>
+                {% include 'pagination/pagination.html' %}
             </div>
-            {% include 'pagination/pagination.html' %}
-        </div>
+        {% endif %}
     </div>
 </div>