diff --git a/web/static/numerus.css b/web/static/numerus.css
index 4f1b572..2db0b16 100644
--- a/web/static/numerus.css
+++ b/web/static/numerus.css
@@ -588,11 +588,6 @@ main > nav {
     right: 0;
 }
 
-/* AlpineJS */
-[x-cloak] {
-    display: none !important;
-}
-
 /* Multiselect */
 .multiselect {
     max-width: 35rem;
diff --git a/web/template/app.gohtml b/web/template/app.gohtml
index d0ad46a..237a83c 100644
--- a/web/template/app.gohtml
+++ b/web/template/app.gohtml
@@ -6,13 +6,6 @@
 		<title>{{ template "title" . }} — Numerus</title>
 		<link rel="stylesheet" type="text/css" media="screen" href="/static/numerus.css">
 		<script defer src="/static/alpinejs@3.12.0.min.js"></script>
-		<noscript>
-            <style>
-                [x-cloak] {
-                    display: revert !important;
-                }
-            </style>
-        </noscript>
 	</head>
 	<body>
 		<header>
diff --git a/web/template/form.gohtml b/web/template/form.gohtml
index 6b9eadb..ac56505 100644
--- a/web/template/form.gohtml
+++ b/web/template/form.gohtml
@@ -40,7 +40,21 @@
 
 {{ define "select-field" -}}
     {{- /*gotype: dev.tandem.ws/tandem/numerus/pkg.SelectField*/ -}}
-    <div class="input {{ if .Errors }}has-errors{{ end }}">
+    <div class="input{{ if .Errors }} has-errors{{ end }}"
+            {{- if .Multiple }}
+                x-data="{
+                    options: [
+                        {{- range $option := .Options }}
+                        { value: '{{ .Value }}', label: '{{ .Label }}', selected: {{ if $.IsSelected .Value }}true{{ else }}false{{ end }} },
+                        {{- end }}
+                    ],
+                    open: false,
+                    init() {
+                        $el.querySelector('select').remove();
+                    },
+                }"
+            {{- end -}}
+    >
         <select id="{{ .Name }}-field" name="{{ .Name }}"
                 {{- range $attribute := .Attributes }} {{$attribute}} {{ end -}}
                 {{ if .Multiple }} multiple="multiple"{{ end -}}
@@ -65,6 +79,30 @@
             </optgroup>
             {{- end }}
         </select>
+        {{- if .Multiple }}
+            <template x-if="true">
+                <div class="multiselect">
+                    <ul class="tags" :class="{'empty': options.filter(option => option.selected).length === 0}"
+                        @click="open = !open" @click.away="open = false">
+                        <template x-for="(option) in options.filter(option => option.selected)">
+                            <li>
+                                <input type="hidden" name="{{ .Name }}" :value="option.value">
+                                <span x-text="option.label"></span>
+                                <button type="button" @click.stop="option.selected = false">×</button>
+                            </li>
+                        </template>
+                    </ul>
+                    <ul class="options" x-show.transition="open">
+                        <template x-for="(option) in options.filter(option => !option.selected)">
+                            <li
+                                    x-text="option.label"
+                                    @click.stop="option.selected = true"
+                            ></li>
+                        </template>
+                    </ul>
+                </div>
+            </template>
+        {{ end -}}
         <label for="{{ .Name }}-field">{{ .Label }}</label>
         {{- if .Errors }}
             <ul>
diff --git a/web/template/products/edit.gohtml b/web/template/products/edit.gohtml
index 0f04c9f..2fd3085 100644
--- a/web/template/products/edit.gohtml
+++ b/web/template/products/edit.gohtml
@@ -20,58 +20,7 @@
             {{ template "input-field" .Name | addInputAttr "autofocus" }}
             {{ template "input-field" .Description }}
             {{ template "input-field" .Price }}
-            <div x-data="{
-                options: [],
-                open: false,
-                init() {
-                    const wrap = $el.querySelector('.input');
-                    const select = wrap.querySelector('select');
-                    for (const option of select.options) {
-                        this.options.push({
-                            value: option.value,
-                            label: option.innerText,
-                            selected: option.getAttribute('selected') !== null,
-                        }); 
-                    }
-                    wrap.remove();
-                }
-            }">
-                <div x-cloak>
-                    {{ template "select-field" .Tax }}
-                </div>
-                {{ with .Tax }}
-                    <template x-if="true">
-                        <div class="input multiselect {{ if .Errors }}has-errors{{ end }}">
-                            <ul class="tags" :class="{'empty': options.filter(option => option.selected).length === 0}"
-                                @click="open = !open" @click.away="open = false">
-                                <template x-for="(option) in options.filter(option => option.selected)">
-                                    <li>
-                                        <input type="hidden" name="{{ .Name }}" :value="option.value">
-                                        <span x-text="option.label"></span>
-                                        <button type="button" @click.stop="option.selected = false">×</button>
-                                    </li>
-                                </template>
-                            </ul>
-                            <span class="placeholder">{{ .Label }}</span>
-                            <ul class="options" x-show.transition="open">
-                                <template x-for="(option) in options.filter(option => !option.selected)">
-                                    <li
-                                            x-text="option.label"
-                                            @click.stop="option.selected = true"
-                                    ></li>
-                                </template>
-                            </ul>
-                            {{- if .Errors }}
-                                <ul>
-                                    {{- range $error := .Errors }}
-                                        <li>{{ . }}</li>
-                                    {{- end }}
-                                </ul>
-                            {{- end }}
-                        </div>
-                    </template>
-                {{ end }}
-            </div>
+            {{ template "select-field" .Tax }}
 
             <fieldset>
                 <button class="primary" type="submit">{{( pgettext "Update product" "action" )}}</button>
