diff --git a/templates/dups.html b/templates/dups.html
index bbffef9..0a1a9a2 100644
--- a/templates/dups.html
+++ b/templates/dups.html
@@ -1,6 +1,5 @@
 {% extends "base.html" %} {% block main_content %}
 	<div class="container-fluid">
-
 		<h3 class="offset-lg-2">{{page_title}}</h3>
         <form id="psform" class="d-flex justify-content-center form-inline" method="POST" action="">
             <input type="hidden" name="fe_msg_id" value="{{fe_msg_id}}"></input>
@@ -129,23 +128,33 @@
                 {% endif %}
 
                 {% set count=namespace( del=0, keep=0 ) %}
-                {% if page.cnt < pagesize %}
-                    {% for dup in DD.per_path_dups %}
-                        {% if DD.preferred_path[dup.did1] or DD.preferred_path[dup.did2] %}
-                            <input id="kdid-{{loop.index}}" type="hidden" name="kdid-1">
-                            <input name="kdhash-{{loop.index}}" type="hidden" value="{{dup.hashes}}">
-                            {% if DD.preferred_path[dup.did1] %}
-                                <input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did1]">
-                            {% else %}
-                                <input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did2]">
-                            {% endif %}
-                            {% set count.keep = count.keep + 1 %}
+                {% for dup in DD.per_path_dups %}
+                    {% if DD.preferred_path[dup.did1] or DD.preferred_path[dup.did2] %}
+                        <input id="kdid-{{loop.index}}" type="hidden" name="kdid-1">
+                        <input name="kdhash-{{loop.index}}" type="hidden" value="{{dup.hashes}}">
+                        {% if DD.preferred_path[dup.did1] %}
+                            <input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did1]">
                         {% else %}
+                            <input type="hidden" name="kdid-{{loop.index}}" value="DD.preferred_path[dup.did2]">
+                        {% endif %}
+                        {% set count.keep = count.keep + 1 %}
+                    {% elif page.cnt <= pagesize %}
                         <div class="col-lg-12 py-2">
                             <h5 class="col-lg-12 mt-3">Choose path to KEEP (same file names in 2 different directories):</h5>
                             {{dup.count}} duplicates in: 
-                            <alert id="kd{{loop.index}}-d1" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 1)" class="alert">{{dup.d1}}</alert> or
-                            <alert id="kd{{loop.index}}-d2" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 2)" class="alert">{{dup.d2}}</alert>
+                            {% if dup.d1 == "" %}
+                                {% set d1="/" %}
+                            {% else %}
+                                {% set d1=dup.d1 %}
+                            {% endif %}
+                            {% if dup.d2 == "" %}
+                                {% set d2="/" %}
+                            {% else %}
+                                {% set d2=dup.d2 %}
+                            {% endif %}
+                                
+                            <alert id="kd{{loop.index}}-d1" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 1)" class="alert">{{d1}}</alert> or
+                            <alert id="kd{{loop.index}}-d2" style="cursor: pointer;" onClick="KeepDir({{loop.index}}, 2)" class="alert">{{d2}}</alert>
                             <input id="kdid-{{loop.index}}" type="hidden" name="kdid-{{loop.index}}">
                             <input name="kdhash-{{loop.index}}" type="hidden" value="{{dup.hashes}}">
                             <script>
@@ -153,13 +162,9 @@
                                 D[{{loop.index}}2]="{{dup.did2}}"
                             </script>
                         </div>
-                        {% endif %}
                         {% set page.cnt = page.cnt + 1 %}
-                        {% if page.cnt == pagesize %}
-                            {% break %}
-                        {% endif %}
-                    {% endfor %}
-                {% endif %}
+                    {% endif %}
+                {% endfor %}
                 {% if count.keep %}
                     <div class="col-lg-12">
                     {% set auto.str = auto.str + "<li>Keeping={}, Deleting={} paths of duplicates</li>".format(count.keep, count.keep) %}