diff --git a/templates/database/central_columns/main.twig b/templates/database/central_columns/main.twig
index a091e91fe0..30b7276dd7 100644
--- a/templates/database/central_columns/main.twig
+++ b/templates/database/central_columns/main.twig
@@ -177,8 +177,6 @@
                     </form>
                 </td>
             {% endif %}
-            </form>
-            </td>
             <td class="navigation_separator"></td>
             <td>
                 <span>{% trans 'Filter rows' %}:</span>
diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index c2b62a2ac9..e85c6ceac6 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -90,7 +90,8 @@
                     <th colspan="6">
                         <a class="formelement clearfloat add_foreign_key" href="">
                             {% trans '+ Add constraint' %}
-                    </td>
+                        </a>
+                    </th>
                 </tr>
             </table>
             </div>
diff --git a/templates/table/search/zoom_result_form.twig b/templates/table/search/zoom_result_form.twig
index 55d36b0887..7543f8558b 100644
--- a/templates/table/search/zoom_result_form.twig
+++ b/templates/table/search/zoom_result_form.twig
@@ -81,5 +81,6 @@
                 </tbody>
             </table>
         </div>
-    <input type="hidden" id="queryID" name="sql_query">
+        <input type="hidden" id="queryID" name="sql_query">
+    </fieldset>
 </form>