diff --git a/var/www/modules/browsepastes/templates/important_paste_by_module.html b/var/www/modules/browsepastes/templates/important_paste_by_module.html
index ff6f3f87..14048bbb 100644
--- a/var/www/modules/browsepastes/templates/important_paste_by_module.html
+++ b/var/www/modules/browsepastes/templates/important_paste_by_module.html
@@ -9,16 +9,14 @@
          </tr>
     </thead>
     <tbody>
-      {% set i = 0 %}
       {% for path in all_path %}
       <tr>
-          <td> {{ i + 1 }}</td>
-          <td><a target="_blank" href="{{ url_for('showsavedpastes.showsavedpaste') }}?paste={{path}}&num={{i+1}}">{{ path }}</a></td>
-          <td>{{ paste_date[i] }}</td>
-          <td>{{ paste_linenum[i] }}</td>
-          <td><p><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="left" title="{{ content[i] }} "></span> <button type="button" class="btn-link" data-num="{{ i + 1 }}" data-toggle="modal" data-target="#mymodal" data-url="{{ url_for('showsavedpastes.showsavedpaste') }}?paste={{ path }}&num={{ i+1 }}" data-path="{{ path }}"><span class="fa fa-search-plus"></span></button></p></td>
+          <td> {{ loop.index0 }}</td>
+          <td><a target="_blank" href="{{ url_for('showsavedpastes.showsavedpaste') }}?paste={{path}}&num={{loop.index0+1}}">{{ path }}</a></td>
+          <td>{{ paste_date[loop.index0] }}</td>
+          <td>{{ paste_linenum[loop.index0] }}</td>
+          <td><p><span class="glyphicon glyphicon-info-sign" data-toggle="tooltip" data-placement="left" title="{{ content[loop.index0] }} "></span> <button type="button" class="btn-link" data-num="{{ loop.index0 + 1 }}" data-toggle="modal" data-target="#mymodal" data-url="{{ url_for('showsavedpastes.showsavedpaste') }}?paste={{ path }}&num={{ loop.index0+1 }}" data-path="{{ path }}"><span class="fa fa-search-plus"></span></button></p></td>
       </tr>
-      {% set i = i + 1 %}
       {%  endfor %}
     </tbody>
 </table>
diff --git a/var/www/modules/showpaste/templates/show_saved_paste.html b/var/www/modules/showpaste/templates/show_saved_paste.html
index 7150b7ba..d58b243f 100644
--- a/var/www/modules/showpaste/templates/show_saved_paste.html
+++ b/var/www/modules/showpaste/templates/show_saved_paste.html
@@ -71,7 +71,7 @@
                   <td>{{ hashtype_list[i] }}</td>
                   <td>Similarity: {{ simil_list[i] }}%</td>
                   <td>{{ date_list[i] }}</td>
-                  <td><a target="_blank" href="{{ url_for('showsavedpaste.showsavedpaste') }}?paste={{ dup_path }}" id='dup_path'>{{ dup_path }}</a></td>
+                  <td><a target="_blank" href="{{ url_for('showsavedpastes.showsavedpaste') }}?paste={{ dup_path }}" id='dup_path'>{{ dup_path }}</a></td>
               </tr>
               {% set i = i + 1 %}
           {% endfor %}