diff --git a/web/template/contacts/index.gohtml b/web/template/contacts/index.gohtml
index efb2f61..fc77e48 100644
--- a/web/template/contacts/index.gohtml
+++ b/web/template/contacts/index.gohtml
@@ -29,7 +29,9 @@
                 {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                 {{ template "toggle-field" .TagsCondition }}
             {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
         </form>
     </div>
     <table>
@@ -46,7 +48,8 @@
         {{ with .Contacts }}
             {{- range $contact := . }}
                 <tr>
-                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}"  data-hx-target="main" data-hx-boost="true">{{ .Name }}</a></td>
+                    <td><a href="{{ companyURI "/contacts/"}}{{ .Slug }}" data-hx-target="main"
+                           data-hx-boost="true">{{ .Name }}</a></td>
                     <td><a href="mailto:{{ .Email }}">{{ .Email }}</a></td>
                     <td><a href="tel:{{ .Phone }}">{{ .Phone }}</a></td>
                     <td
diff --git a/web/template/dashboard.gohtml b/web/template/dashboard.gohtml
index 103f24c..0e40395 100644
--- a/web/template/dashboard.gohtml
+++ b/web/template/dashboard.gohtml
@@ -19,7 +19,9 @@
             {{ with .Filters }}
                 {{ template "radio-field" .Period }}
             {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
         </form>
     </div>
     <dl id="income-statement">
diff --git a/web/template/expenses/index.gohtml b/web/template/expenses/index.gohtml
index 9c4bc41..50dc9f6 100644
--- a/web/template/expenses/index.gohtml
+++ b/web/template/expenses/index.gohtml
@@ -31,7 +31,9 @@
                 {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                 {{ template "toggle-field" .TagsCondition }}
             {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
         </form>
     </div>
     <table>
diff --git a/web/template/invoices/index.gohtml b/web/template/invoices/index.gohtml
index 71a715f..f6bab40 100644
--- a/web/template/invoices/index.gohtml
+++ b/web/template/invoices/index.gohtml
@@ -37,7 +37,9 @@
                 {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                 {{ template "toggle-field" .TagsCondition }}
             {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
         </form>
     </div>
     <table class="no-padding">
diff --git a/web/template/products/index.gohtml b/web/template/products/index.gohtml
index 52a5389..263667a 100644
--- a/web/template/products/index.gohtml
+++ b/web/template/products/index.gohtml
@@ -29,7 +29,9 @@
                 {{ template "tags-field" .Tags | addTagsAttr (print `data-conditions="` .TagsCondition.Name  `-field"`) }}
                 {{ template "toggle-field" .TagsCondition }}
             {{ end }}
-            <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            <noscript>
+                <button type="submit">{{( pgettext "Filter" "action" )}}</button>
+            </noscript>
         </form>
     </div>
     <table>
@@ -45,7 +47,8 @@
         {{ with .Products }}
             {{- range $product := . }}
                 <tr>
-                    <td><a href="{{ companyURI "/products/"}}{{ .Slug }}" data-hx-target="main" data-hx-boost="true">{{ .Name }}</a></td>
+                    <td><a href="{{ companyURI "/products/"}}{{ .Slug }}" data-hx-target="main"
+                           data-hx-boost="true">{{ .Name }}</a></td>
                     <td
                             data-hx-get="{{companyURI "/products/"}}{{ .Slug }}/tags/edit"
                             data-hx-target="this"