diff --git a/templates/files.html b/templates/files.html
index 406bdd3..31d27bb 100644
--- a/templates/files.html
+++ b/templates/files.html
@@ -108,7 +108,7 @@
         </form>
 
         {% set last = namespace(printed=0) %}
-        {% if grouping == "None" %}
+        {% if folders or grouping == "None" %}
             <div class="row pl-3">
         {% endif %}
         {% for obj in entry_data %}
@@ -158,13 +158,25 @@
                 {% if (not folders) or ((obj.in_dir.in_path.path_prefix+'/'+obj.in_dir.rel_path+'/'+obj.name) | TopLevelFolderOf(cwd)) %}
                     <figure id="{{obj.id}}" img="{{loop.index-1}}" class="figure mx-1" fname="{{obj.name}}" yr="{{obj.file_details.year}}" date="{{obj.file_details.year}}{{"%02d" % obj.file_details.month}}{{"%02d" % obj.file_details.day}}" details="{{obj.name}} (Date: {{obj.file_details.day}}/{{obj.file_details.month}}/{{obj.file_details.year}})">
                         {% if obj.type.name=="Image" %}
-                            <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}"><img class="thumb" height="{{size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
+                            <div style="position:relative; width:100%">
+                                <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}"><img class="thumb" height="{{size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
+                                {% if search_term is defined %}
+                                    <div style="position:absolute; bottom: 2; left: 2;">
+                                        <i style="font-size:16;background-color:black;color:white" class="fas {{LocationIcon(obj)}}"></i>
+                                    </div>
+                                {% endif %}
+                            </div>
                         {% elif obj.type.name == "Video" %}
                             <div style="position:relative; width:100%">
                                 <a href="{{obj.in_dir.in_path.path_prefix}}/{{obj.in_dir.rel_path}}/{{obj.name}}"><img class="thumb" style="display:block" height="{{size}}" src="data:image/jpeg;base64,{{obj.file_details.thumbnail}}"></img></a>
                                 <div style="position:absolute; top: 2; left: 2;">
                                     <i style="font-size:32;background-color:black;color:white" class="fas fa-film"></i>
                                 </div>
+                                {% if search_term is defined %}
+                                    <div style="position:absolute; bottom: 2; left: 2;">
+                                        <i style="font-size:16;background-color:black;color:white" class="fas {{LocationIcon(obj)}}"></i>
+                                    </div>
+                                {% endif %}
                             </div>
                         {% endif %}
                         {# finding text distracting, <figcaption style="font-size:12px;" class="figure-caption text-center">{{obj.name}}</figcaption> #}