diff --git a/app/imports/ui/properties/forms/AdjustmentForm.vue b/app/imports/ui/properties/forms/AdjustmentForm.vue
index 23272baa..183a72c3 100644
--- a/app/imports/ui/properties/forms/AdjustmentForm.vue
+++ b/app/imports/ui/properties/forms/AdjustmentForm.vue
@@ -29,6 +29,14 @@
       :menu-props="{auto: true, lazy: true}"
       @change="change('target', ...arguments)"
     />
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/AttributeForm.vue b/app/imports/ui/properties/forms/AttributeForm.vue
index c238df43..eab23559 100644
--- a/app/imports/ui/properties/forms/AttributeForm.vue
+++ b/app/imports/ui/properties/forms/AttributeForm.vue
@@ -65,6 +65,14 @@
       name="Advanced"
       standalone
     >
+      <smart-combobox
+        label="Tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.tags"
+        @change="change('tags', ...arguments)"
+      />
       <div class="layout column align-center">
         <smart-switch
           v-if="model.attributeType !== 'hitDice'"
diff --git a/app/imports/ui/properties/forms/BuffForm.vue b/app/imports/ui/properties/forms/BuffForm.vue
index 513bc15a..61d26aa8 100644
--- a/app/imports/ui/properties/forms/BuffForm.vue
+++ b/app/imports/ui/properties/forms/BuffForm.vue
@@ -31,6 +31,14 @@
       :menu-props="{auto: true, lazy: true}"
       @change="change('target', ...arguments)"
     />
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ContainerForm.vue b/app/imports/ui/properties/forms/ContainerForm.vue
index 1435bf47..fcd5998a 100644
--- a/app/imports/ui/properties/forms/ContainerForm.vue
+++ b/app/imports/ui/properties/forms/ContainerForm.vue
@@ -55,6 +55,14 @@
       name="Advanced"
       standalone
     >
+      <smart-combobox
+        label="Tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.tags"
+        @change="change('tags', ...arguments)"
+      />
       <div class="layout row justify-center">
         <div>
           <smart-switch
diff --git a/app/imports/ui/properties/forms/DamageForm.vue b/app/imports/ui/properties/forms/DamageForm.vue
index c90621a2..98ddc878 100644
--- a/app/imports/ui/properties/forms/DamageForm.vue
+++ b/app/imports/ui/properties/forms/DamageForm.vue
@@ -28,6 +28,16 @@
       :menu-props="{auto: true, lazy: true}"
       @change="change('target', ...arguments)"
     />
+    <smart-combobox
+      label="Tags"
+      class="mr-2"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      :error-messages="errors.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/DamageMultiplierForm.vue b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
index b0baf772..feb29f0c 100644
--- a/app/imports/ui/properties/forms/DamageMultiplierForm.vue
+++ b/app/imports/ui/properties/forms/DamageMultiplierForm.vue
@@ -28,6 +28,14 @@
         @change="change('value', ...arguments)"
       />
     </div>
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ItemForm.vue b/app/imports/ui/properties/forms/ItemForm.vue
index 79ff3630..04250b6c 100644
--- a/app/imports/ui/properties/forms/ItemForm.vue
+++ b/app/imports/ui/properties/forms/ItemForm.vue
@@ -79,12 +79,6 @@
       name="Advanced"
       standalone
     >
-      <smart-switch
-        label="Show increment button"
-        :value="model.showIncrement"
-        :error-messages="errors.showIncrement"
-        @change="change('showIncrement', ...arguments)"
-      />
       <smart-combobox
         label="Tags"
         class="mr-2"
@@ -95,6 +89,12 @@
         :error-messages="errors.tags"
         @change="change('tags', ...arguments)"
       />
+      <smart-switch
+        label="Show increment button"
+        :value="model.showIncrement"
+        :error-messages="errors.showIncrement"
+        @change="change('showIncrement', ...arguments)"
+      />
       <smart-switch
         label="Requires attunement"
         :value="model.requiresAttunement"
diff --git a/app/imports/ui/properties/forms/NoteForm.vue b/app/imports/ui/properties/forms/NoteForm.vue
index 6067d18d..cf8a4dc8 100644
--- a/app/imports/ui/properties/forms/NoteForm.vue
+++ b/app/imports/ui/properties/forms/NoteForm.vue
@@ -13,6 +13,14 @@
       :error-messages="errors.description"
       @change="change('description', ...arguments)"
     />
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ProficiencyForm.vue b/app/imports/ui/properties/forms/ProficiencyForm.vue
index e4bd20e4..769ffd68 100644
--- a/app/imports/ui/properties/forms/ProficiencyForm.vue
+++ b/app/imports/ui/properties/forms/ProficiencyForm.vue
@@ -27,6 +27,14 @@
         @change="change('value', ...arguments)"
       />
     </div>
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SavingThrowForm.vue b/app/imports/ui/properties/forms/SavingThrowForm.vue
index c4ed3410..1f471a7f 100644
--- a/app/imports/ui/properties/forms/SavingThrowForm.vue
+++ b/app/imports/ui/properties/forms/SavingThrowForm.vue
@@ -21,6 +21,16 @@
       :error-messages="errors.stat"
       @change="change('stat', ...arguments)"
     />
+    <smart-combobox
+      label="Tags"
+      class="mr-2"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      :error-messages="errors.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/SkillForm.vue b/app/imports/ui/properties/forms/SkillForm.vue
index 57381ce6..27f22104 100644
--- a/app/imports/ui/properties/forms/SkillForm.vue
+++ b/app/imports/ui/properties/forms/SkillForm.vue
@@ -44,6 +44,14 @@
       name="Advanced"
       standalone
     >
+      <smart-combobox
+        label="Tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.tags"
+        @change="change('tags', ...arguments)"
+      />
       <div class="layout row justify-center">
         <text-field
           label="Base Value"
diff --git a/app/imports/ui/properties/forms/SlotFillerForm.vue b/app/imports/ui/properties/forms/SlotFillerForm.vue
index 3348eb5e..43d24f5e 100644
--- a/app/imports/ui/properties/forms/SlotFillerForm.vue
+++ b/app/imports/ui/properties/forms/SlotFillerForm.vue
@@ -15,6 +15,12 @@
       :error-messages="errors.name"
       @change="change('name', ...arguments)"
     />
+    <text-area
+      label="Description"
+      :value="model.description"
+      :error-messages="errors.description"
+      @change="change('description', ...arguments)"
+    />
     <text-field
       label="Picture URL"
       hint="A link to an image representing this property"
@@ -31,15 +37,6 @@
       :error-messages="errors.slotFillerType"
       @change="change('slotFillerType', ...arguments)"
     />
-    <smart-combobox
-      label="Tags"
-      multiple
-      chips
-      deletable-chips
-      :value="model.tags"
-      :error-messages="errors.tags"
-      @change="change('tags', ...arguments)"
-    />
     <text-field
       label="Quantity"
       type="number"
@@ -57,25 +54,23 @@
       :error-messages="errors.slotFillerCondition"
       @change="change('slotFillerCondition', ...arguments)"
     />
-    <calculation-error-list :errors="model.slotConditionErrors" />
-    <text-area
-      label="Description"
-      :value="model.description"
-      :error-messages="errors.description"
-      @change="change('description', ...arguments)"
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      :error-messages="errors.tags"
+      @change="change('tags', ...arguments)"
     />
   </div>
 </template>
 
 <script>
   import propertyFormMixin from '/imports/ui/properties/forms/shared/propertyFormMixin.js';
-  import CalculationErrorList from '/imports/ui/properties/forms/shared/CalculationErrorList.vue';
   import PROPERTIES from '/imports/constants/PROPERTIES.js';
 
 	export default {
-    components: {
-      CalculationErrorList,
-		},
     mixins: [propertyFormMixin],
     data(){
       let slotTypes = [];
diff --git a/app/imports/ui/properties/forms/SlotForm.vue b/app/imports/ui/properties/forms/SlotForm.vue
index 938678e3..fdf4eddc 100644
--- a/app/imports/ui/properties/forms/SlotForm.vue
+++ b/app/imports/ui/properties/forms/SlotForm.vue
@@ -17,7 +17,7 @@
       @change="change('slotType', ...arguments)"
     />
     <smart-combobox
-      label="Tags"
+      label="Tags Required"
       hint="The slot must be filled with a property which has all the listed tags"
       multiple
       chips
@@ -54,6 +54,14 @@
       name="Advanced"
       standalone
     >
+      <smart-combobox
+        label="Tags"
+        multiple
+        chips
+        deletable-chips
+        :value="model.tags"
+        @change="change('tags', ...arguments)"
+      />
       <div class="layout row wrap justify-space-between">
         <smart-switch
           label="Ignored"
diff --git a/app/imports/ui/properties/forms/SpellListForm.vue b/app/imports/ui/properties/forms/SpellListForm.vue
index 51fb0b0a..b7a929cb 100644
--- a/app/imports/ui/properties/forms/SpellListForm.vue
+++ b/app/imports/ui/properties/forms/SpellListForm.vue
@@ -31,6 +31,14 @@
       @change="change('maxPrepared', ...arguments)"
     />
     <calculation-error-list :errors="model.maxPreparedErrors" />
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>
 
diff --git a/app/imports/ui/properties/forms/ToggleForm.vue b/app/imports/ui/properties/forms/ToggleForm.vue
index ecc9f248..04d5e899 100644
--- a/app/imports/ui/properties/forms/ToggleForm.vue
+++ b/app/imports/ui/properties/forms/ToggleForm.vue
@@ -39,6 +39,14 @@
       />
     </v-fade-transition>
     <calculation-error-list :errors="model.errors" />
+    <smart-combobox
+      label="Tags"
+      multiple
+      chips
+      deletable-chips
+      :value="model.tags"
+      @change="change('tags', ...arguments)"
+    />
   </div>
 </template>