diff --git a/src/app/configuration/itemEdit.tpl.html b/src/app/configuration/itemEdit.tpl.html
index 458a44e0..312e8616 100644
--- a/src/app/configuration/itemEdit.tpl.html
+++ b/src/app/configuration/itemEdit.tpl.html
@@ -50,8 +50,7 @@ <h3 class="modal-title" i18n="item.EditTitle"></h3>
                 <ui-select id="inputCategory"
                            ng-model="item.category"
                            theme="bootstrap"
-                           search-enabled="false"
-                        >
+                           search-enabled="false">
                     <ui-select-match i18n-attr="{placeholder: 'item.SelectCategory'}">
                         <habmin-icon class="fa fa-fw" category="{{$select.selected.id}}"></habmin-icon>
                         {{$select.selected.name}}
@@ -64,6 +63,23 @@ <h3 class="modal-title" i18n="item.EditTitle"></h3>
             </div>
         </div>
 
+        <div class="form-group">
+            <label for="inputTags" class="control-label" i18n="item.EditTags"></label>
+
+            <div>
+                <ui-select id="inputTags"
+                           multiple tagging tagging-label="(custom 'new' label)"
+                           ng-model="item.tags"
+                           theme="bootstrap"
+                           sortable="true">
+                    <ui-select-match placeholder="Select colors...">{{$item}}</ui-select-match>
+                    <ui-select-choices repeat="color in availableColors | filter:$select.search">
+                        {{color}}
+                    </ui-select-choices>
+                </ui-select>
+            </div>
+        </div>
+
         <div class="form-group">
             <label for="inputGroups" class="control-label" i18n="item.EditGroups"></label>
 
diff --git a/src/app/configuration/thingAttributesZWave.tpl.html b/src/app/configuration/thingAttributesZWave.tpl.html
index ce477d10..ebb62b86 100644
--- a/src/app/configuration/thingAttributesZWave.tpl.html
+++ b/src/app/configuration/thingAttributesZWave.tpl.html
@@ -5,12 +5,14 @@
 
 <div class="row">
     <div class="col-md-4" i18n="zwave.Manufacturer"></div>
-    <div class="col-md-8">{{dec2hex(selectedThing.properties['zwave_manufacturer'], 4)}}</div>
+    <div class="col-md-8" ng-if="selectedThing.properties['zwave_manufacturer']">
+        {{dec2hex(selectedThing.properties['zwave_manufacturer'], 4)}}
+    </div>
 </div>
 <div class="row">
     <div class="col-md-4" i18n="zwave.TypeId"></div>
-    <div class="col-md-8">{{dec2hex(selectedThing.properties['zwave_devicetype'],
-        4)}}:{{dec2hex(selectedThing.properties['zwave_deviceid'], 4)}}
+    <div class="col-md-8" ng-if="selectedThing.properties['zwave_devicetype']">
+        {{dec2hex(selectedThing.properties['zwave_devicetype'],4)}}:{{dec2hex(selectedThing.properties['zwave_deviceid'],4)}}
     </div>
 </div>
 <div class="row">
diff --git a/src/languages/en-GB/item.lang.json b/src/languages/en-GB/item.lang.json
index 0132c6e0..043207b9 100644
--- a/src/languages/en-GB/item.lang.json
+++ b/src/languages/en-GB/item.lang.json
@@ -4,10 +4,12 @@
   "EditLabel": "Label",
   "EditFormat": "Format",
   "EditType": "Item Type",
+  "EditTags": "Tags",
   "EditCategory": "Category",
   "EditGroups": "Groups",
   "SelectName": "Enter name...",
   "SelectLabel": "Enter label...",
+  "SelectTags": "Select tags...",
   "SelectCategory": "Select category...",
   "SelectGroup": "Select groups...",
   "SelectType": "Select type...",