diff --git a/README.md b/README.md
index a2d1018..51d0b3c 100644
--- a/README.md
+++ b/README.md
@@ -2,16 +2,14 @@
 
 [![Build Status](https://travis-ci.org/ghys/habot.svg?branch=master)](https://travis-ci.org/ghys/habot)
 
-HABot is a chatbot for [openHAB](https://openhab.org), running inside the [Eclipse SmartHome](https://eclipse.org/smarthome/) runtime with no dependency; it is offline and private by design, but can be added to the Android homescreen as a [Progressive Web App](https://developers.google.com/web/progressive-web-apps/) with resource caching (so it's very fast!) if served over HTTPS from an openHAB Cloud instance (like [myopenhab.org](https://www.myopenhab.org)) and used on the go.
-
-__If you have feature requests or issues, please have a look at the (already quite full)  [roadmap](https://github.com/ghys/habot/projects) first! Thanks :)__
+HABot is a chatbot for [openHAB](https://openhab.org), running inside the [Eclipse SmartHome](https://eclipse.org/smarthome/) runtime with no dependency; it can run offline and keep your data out of third-party clouds, but works very well remotely if served from an openHAB Cloud instance (like [myopenhab.org](https://www.myopenhab.org)). In that scenario it can even be added to the Android homescreen as a [Progressive Web App](https://developers.google.com/web/progressive-web-apps/), and adds features working only on "secure origins" like push notifications, speech recognition and resource caching.
 
 It consists in:
 
 - a machine-learning natural language processor based on [Apache OpenNLP](https://opennlp.apache.org) for intent classification and entity extraction (thanks to [nlp-intent-toolkit](https://github.com/mlehman/nlp-intent-toolkit));
-- a modular skill system with intent interpreters and learning data provision (can be injected as OSGi components);
-- a mobile-first (but usable on a desktop too) web UI built with the [Quasar Framework](http://quasar-framework.org) and related REST API, to interact with the bot with messages and a full card designer
-- the interpreter is also an Eclipse SmartHome [Human Language Interpreter](http://docs.openhab.org/configuration/multimedia.html#human-language-interpreter) - this means the natural language answers will eventually expand to more than "here's what I found" and "there you go", athen it will eventually be able to answer questions and execute orders without a visual UI, when coupled with speech-to-text and text-to-speech engines in ESH. It is another step to have a full, open source, privacy-focused, integrated natural language processing toolchain for your openHAB smart home.
+- a modular intent-based skill system with learning data provisioning (basic skills to retrieve item statuses, historical data and send basic commands are built-in, but more can be injected by other OSGi dependency injection);
+- a fully-featured responsive card-based user interface built with the [Quasar Framework](http://quasar-framework.org) and its companion REST API to interact with the bot;
+- an Eclipse SmartHome [Human Language Interpreter](http://docs.openhab.org/configuration/multimedia.html#human-language-interpreter) - this means once the natural language answers expand to more than "here's what I found" and "there you go", you will eventually be able to ask HABot questions and give it orders without a visual UI when coupled with speech-to-text and text-to-speech engines in ESH, for instance to build privacy-focused specialized voice assistant. It is another step to have a full, open source, privacy-focused, integrated natural language processing toolchain for your openHAB smart home.
 
 ## Screenshots
 
@@ -25,56 +23,68 @@ Grab the latest release from https://github.com/ghys/habot/releases and drop the
 
 To upgrade, just replace the .jar by the new version. Also go the web app's settings and hit _"Refresh the application"_ to make sure the old version doesn't remain cached. Verify the version by checking the build date under _About HABot_. You might encounter exceptions after upgrading (see https://github.com/ghys/habot/projects/5#card-8141287), this is known and will be fixed. Restarting openHAB should fix the problem.
 
-### Tag your items
+### Configure named attributes on your items
+
+#### What are named attributes?
+
+When chatting with HABot you'll likely mention some _object_ (the "what", which can be a physical thing, or a property or purpose like "temperature" or "smoke alarm") and/or a _location_ (the "where", for instance "kitchen" or "first floor").
 
-When chatting with HABot you'll likely mention some _object_ and a _location_.
+It will try to extract those concepts from your query and then match items to display or act upon, by looking into "named attributes" it knows about them.
 
-HABot is only able to determine which items correspond to those entities recognized in the query by looking at certain tags applied to your items.
+A table of named attributes for each item can be displayed by selecting the "View item attributes" option in HABot webapp's Settings page.
 
-You can either apply these tags in your .items files, or with an (upcoming) screen inside the web app for things added from the inbox in Paper UI.
+#### How to add named attributes
 
-Tags recognized by HABot have this syntax (**use only lowercase**):
+Named attributes can be added to items in several ways:
+
+1. Using tags from the Eclipse SmartHome [semantic tag library](https://github.com/eclipse/smarthome/wiki/Semantic-Tag-Library). Example of those tags include `object:Camera`, `property:Temperature`, `purpose:Heating` or `location:FirstFloor`. If a semantic tag is applied on an item, will translate it into one of several named attributes (including synonyms and plurals) for you using an internal dictionary, available in 3 languages. Semantic tags can be added on items through .items files, or they may be set automatically by bindings or other means in the future. Multiple tags, even of the same type (for instance both `location:GroundFloor` and `location:Kitchen`), are allowed on a item.
+
+2. Using a comma-separated list of monikers in the item's `habot` [metadata namespace](http://www.eclipse.org/smarthome/documentation/concepts/items.html#item-metadata) - this is especially useful for very specific names or items not corresponding to any known concept in the semantic tag library. Monikers added though metadata in this way are supposed to be of the "object" ("what") type unless you specify `type="location"` in the additional metadata configuration:
 
 ```
-entity_type:value
+Switch Bedside_Lamp <bedroom> ["purpose:Lighting"] { habot="Bedside Lamp" }
+Group FF_Child_Bedroom <bedroom> ["location:Bedroom"] { habot="Amelia's Room,Amy's Room" [ type="location" ] }
 ```
 
-For example:
+In the "View item attributes" setting dialog, named attributes added through semantic tags appear as blue chips, while attributes added through the "habot" metadata namespace appear as dark gray chips. Both methods may be used on a single item.
 
-- `object:temperature`
-- `object:water consumption`
-- `location:kitchen`
-- `location:first floor`
+#### Group inheritance principle
 
-If openHAB is set to another language supported by HABot, leave the `object:` and `location:` prefixes untranslated; examples: `object:beleuchtung` or `location:salle à manger`.
+To avoid adding the same attributes individually to similar items one by one, either via tags or metadata, HABot will by default consider that a semantic tag or metadata specified on a Group item applies implicitely to all direct or indirect members of the group too. This is shown on the "View item attributes" setting dialog: attributes inherited from a parent group are shown in a faded color.
 
-It is possible to have multiple tags of the same type for an item: for instance, lights can also be called "hue" or "lighting", and they can be both in the location "kitchen" and the location "ground floor".
+You can however prevent this behavior for a specific group, and for tags only, with a special property in the item's "habot" metadata namespace configuration:
 
-To avoid tagging items one by one, tags can also be used on groups, this is useful because all members of the group will then inherit the tag, saving you from applying it individually. In the HABot web app settings, you will find an option to display all your items, their groups, tags directly applied to them, and tags inherited because they're members of a tagged group. You'll also be able (soon) to apply tags to items mapped to things in Paper UI from there.
+```
+Group GF_Kitchen "Kitchen Beacon" ["object:room"] { habot="" [ inheritTags=false ] }
+```
+
+Attributes added though metadata are always inherited to group members.
 
-Complete example below:
+#### Complete example
 
 ```
-Group gFF           "First Floor"   <firstfloor> ["location:first floor"]
-Group gGF           "Ground Floor"  <groundfloor> ["location:ground floor"]
-Group gC            "Cellar"        <cellar> ["location:cellar"]
-Group Garden        "Garden"        <garden> ["location:garden"]
-
-Group GF_Living     "Living Room"   <video>     (gGF) ["location:living room"]
-Group GF_Kitchen    "Kitchen"       <kitchen>   (gGF) ["location:kitchen"]
-Group GF_Toilet     "Toilet"        <bath>      (gGF) ["location:toilet"]
-Group GF_Corridor   "Corridor"      <corridor>  (gGF) ["location:corridor"]
-
-Group FF_Bath       "Bathroom"      <bath>      (gFF) ["location:bathroom"]
-Group FF_Office     "Office"        <office>    (gFF) ["location:office"]
-Group FF_Child      "Child's Room"  <boy_1>      (gFF) ["location:child's room"]
-Group FF_Bed        "Bedroom"       <bedroom>   (gFF) ["location:bedroom"]
-Group FF_Corridor   "Corridor"      <corridor>  (gFF) ["location:corridor"]
-
-Group:Switch:OR(ON, OFF)        Lights      "All Lights [(%d)]"     ["object:light", "object:lights", "object:lighting"]
-Group:Switch:OR(ON, OFF)        Heating     "No. of Active Heatings [(%d)]"     <heating>   ["object:heating", "object:radiator"]
-Group:Number:AVG                Temperature "Avg. Room Temperature [%.1f °C]"   <temperature>   (Status)    ["object:temperature"]
-Group:Contact:OR(OPEN, CLOSED)  Windows     "Open windows [(%d)]"               <contact>   ["object:window"]
+Group gFF           "First Floor"   <firstfloor> ["location:FirstFloor"]
+Group gGF           "Ground Floor"  <groundfloor> ["location:GroundFloor"]
+Group gC            "Cellar"        <cellar> ["location:Cellar"]
+Group Garden        "Garden"        <garden> ["location:Garden"]
+
+Group GF_Living     "Living Room"   <video>     (gGF) ["location:LivingRoom"]
+Group GF_Kitchen    "Kitchen"       <kitchen>   (gGF) ["location:Kitchen"]
+Group GF_Toilet     "Toilet"        <bath>      (gGF) ["location:Toilet"]
+Group GF_Corridor   "Corridor"      <corridor>  (gGF) ["location:Corridor"]
+
+Group FF_Bath       "Bathroom"      <bath>      (gFF) ["location:Bathroom"]
+Group FF_Office     "Office"        <office>    (gFF) ["location:Office"]
+
+Group FF_Son        "Oliver's Room" <boy_1>     (gFF) ["location:Bedroom"] { habot="Oli's Room,Oliver's Room" [ type="location" ] }
+Group FF_Daughter   "Amelia's Room" <girl_1>    (gFF) ["location:Bedroom"] { habot="Amy's Room,Amelia's Room" [ type="location" ] }
+Group FF_Bed        "Bedroom"       <bedroom>   (gFF) ["location:Bedroom"] { habot="Master bedroom" [ type="location" ] }
+Group FF_Corridor   "Corridor"      <corridor>  (gFF) ["location:Corridor"]
+
+Group:Switch:OR(ON, OFF)        Lights      "All Lights [(%d)]"     ["purpose:Lighting"]
+Group:Switch:OR(ON, OFF)        Heating     "No. of Active Heatings [(%d)]"     <heating>   ["purpose:Heating"]
+Group:Number:AVG                Temperature "Avg. Room Temperature [%.1f °C]"   <temperature>   (Status)    ["property:temperature"]
+Group:Contact:OR(OPEN, CLOSED)  Windows     "Open windows [(%d)]"               <contact>   ["object:Window"]
 
 Dimmer Light_GF_Living_Table        "Table"     (GF_Living, Lights)
 Switch Light_GF_Corridor_Ceiling    "Ceiling"       (GF_Corridor, Lights)
@@ -88,7 +98,8 @@ Switch Light_FF_Bath_Ceiling        "Ceiling"       (FF_Bath, Lights)
 Switch Light_FF_Bath_Mirror         "Mirror"        (FF_Bath, Lights)
 Switch Light_FF_Corridor_Ceiling    "Corridor"      (FF_Corridor, Lights)
 Switch Light_FF_Office_Ceiling      "Ceiling"       (FF_Office, Lights)
-Switch Light_FF_Child_Ceiling       "Ceiling"       (FF_Child, Lights)
+Switch Light_FF_Son_Ceiling         "Ceiling"       (FF_Son, Lights)
+Switch Light_FF_Daughter_Ceiling    "Ceiling"       (FF_Daughter, Lights)
 Switch Light_FF_Bed_Ceiling         "Ceiling"       (FF_Bed, Lights)
 
 ...
@@ -96,15 +107,16 @@ Switch Light_FF_Bed_Ceiling         "Ceiling"       (FF_Bed, Lights)
 Number Temperature_GF_Corridor  "Temperature [%.1f °C]" <temperature>   (Temperature, GF_Corridor)
 Number Temperature_GF_Toilet    "Temperature [%.1f °C]" <temperature>   (Temperature, GF_Toilet)
 Number Temperature_GF_Living    "Temperature [%.1f °C]" <temperature>   (Temperature, GF_Living)
-Number Temperature_GF_Kitchen   "Temperature [%.1f °C]" <temperature>   (Temperature, GF_Kitchen, Thermostat) ["CurrentTemperature"]
+Number Temperature_GF_Kitchen   "Temperature [%.1f °C]" <temperature>   (Temperature, GF_Kitchen)
 Number Temperature_FF_Bath      "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Bath)
 Number Temperature_FF_Office    "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Office)
-Number Temperature_FF_Child     "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Child)
+Number Temperature_FF_Son       "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Son)
+Number Temperature_FF_Daughter  "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Daughter)
 Number Temperature_FF_Bed       "Temperature [%.1f °C]" <temperature>   (Temperature, FF_Bed)
 
 ...
 
-Contact Window_GF_Frontdoor     "Frontdoor [MAP(en.map):%s]"        (GF_Corridor, Windows) ["object:door", "object:frontdoor", "object:front door"]
+Contact Window_GF_Frontdoor     "Frontdoor [MAP(en.map):%s]"        (GF_Corridor, Windows) ["object:FrontDoor"]
 Contact Window_GF_Kitchen       "Kitchen [MAP(en.map):%s]"          (GF_Kitchen, Windows)
 Contact Window_GF_Living        "Terrace door [MAP(en.map):%s]"     (GF_Living, Windows)
 Contact Window_GF_Toilet        "Toilet [MAP(en.map):%s]"           (GF_Toilet, Windows)
@@ -112,17 +124,34 @@ Contact Window_GF_Toilet        "Toilet [MAP(en.map):%s]"           (GF_Toilet,
 Contact Window_FF_Bath          "Bath [MAP(en.map):%s]"             (FF_Bath, Windows)
 Contact Window_FF_Bed           "Bedroom [MAP(en.map):%s]"          (FF_Bed, Windows)
 Contact Window_FF_Office_Window "Office Window [MAP(en.map):%s]"    (FF_Office, Windows)
-Contact Window_FF_Office_Door   "Balcony Door [MAP(en.map):%s]"     (FF_Office, Windows) ["object:door"]
+Contact Window_FF_Office_Door   "Balcony Door [MAP(en.map):%s]"     (FF_Office, Windows) ["object:Door"] { habot="Balcony" }
 
 ```
 
 ### Build cards to replace the defaults
 
-Once items are tagged, you can try chatting with HABot by asking questions and giving orders like _"what's the temperature in the kitchen?"_ or _"switch on the tv in the living room"_ (check the [training data](https://github.com/ghys/habot/tree/master/src/main/resources/train) for some clues about what it can do at the moment. It will reply with a natural language answer and present you with a card containing the matching items using their tags, but you can also alter those cards!
+Once attributes are properly set on items, you can try chatting with HABot by asking questions and giving orders like _"what's the temperature in the kitchen?"_ or _"switch on the tv in the living room"_ (check the [training data](https://github.com/ghys/habot/tree/master/src/main/resources/train) for some clues about what it can do at the moment. It will reply with a natural language answer and present you with a card containing the matching items, but you can also alter those cards!
+
+Cards in HABot also have objects and locations attributes, and **if there is already a card with the same attributes as those extracted from a chat query saved in your "card deck", HABot will display the saved card instead of generating one.** You can save an auto-generated card to the card deck with the _"Add to Card deck"_ option its context menu while chatting, and it will have the same attributes (objects and locations) as recognized in the corresponding query, therefore from then on, subsequent queries with the same recognized object and/or location will reuse the saved card, not build a new one. This allows you to make the necessary changes to the card in the Card designer as you see fit, and bring it back by simply asking HABot the same query you used intially. Only remember if the matching items evolve (for example if some are added, renamed or removed), this won't be reflected automatically in the saved card, it's now your responsibility to add them to it.
+
+The Card Designer will eventually be properly documented but is quite easy to use; just remember the card is a tree of _components_, each having its own configuration and sometimes also _slots_, which are placeholders in certain locations within the component where other subcomponents may be added. Certain components can only be added to certain slots; when selecting a slot, the designer only lets you add components valid for that slot. The HABot components are mostly mapped to their [Quasar framework counterparts](http://quasar-framework.org/components/), often with the same property names, so their accepted values might also be found in the Quasar docs.
 
-**If there is already a card with those same tags saved in your "card deck", HABot will display the saved card instead of generating one.** You can save an auto-generated card to the card deck with the _"Add to Card deck"_ option its context menu while chatting, and it will have the same tags as the items that matched the query. This means subsequent queries with the same recognized object and/or location will present the saved card from the card deck rather than generating a new one. This allows you to make the necessary changes to the card in the Card designer as you see fit, and bring it back by simply asking HABot about those tags. Only remember if the matching items evolve, they won't appear automatically in a saved card, it's now your responsibility to add them to it.
+Some components also accept expressions in certain config properties, for instance the HbCard title and subtitle, or the HbListItem label and sublabel. Simply prefix the expression with '=' (example: `=2+3` or `="Desired temperature: " + items.Temperature_Setpoing.state + "°C"` and it will be considered an expression/formula rather than literal text - much like Excel! The [jexl](https://github.com/TomFrost/Jexl) library (not Apache JEXL) is used to evaluate expressions. Stay tuned for a more complete description of what they can do. You can for instance a ternary operator to change a color property dynamically: `=items.Alarm.state == 'ON' > "red" : "green"`
 
-Using the card designer will eventually be properly documented but is quite easy to use; just remember the card is a tree of _components_, each having its own configuration and sometimes also _slots_, which are placeholder in certain locations within the component where other subcomponents may be added. Certain components can only be added to certain slots; when selecting a slot, the designer only lets you add components valid for that slot. The HABot components are mostly mapped to their [Quasar framework counterparts](http://quasar-framework.org/components/), often with the same property names, so their accepted values might also be found in the Quasar docs.
+Finally, certain rendering features for specific items can be specified though the item's tags and metadata:
+
+- Switches will be added alongside sliders for Dimmer items representations if they have the `capability:Switchable` tag;
+- If there is a `control="knob"` in the "habot" metadata property of a Dimmer item, a knob will be rendered instead of a slider on generated single-item cards;
+- Generated multi-item cards will use the "label", "sublabel", "leftIcon", "leftLetter", "leftColor" properties from metadata if specified on the HbListItem components (all accept expressions like described below)
+- HbSlider and HbKnob will use the "min", "max", "step" metadata properties in the "habot" namespace.
+
+Examples:
+```
+Dimmer Thermostat <thermostat> { habot="Nest" [ control="knob", min=18, max=27, step=0.5, color="=items.Temperature.state < 16 ? 'blue' : 'black'" ] }
+Number Temperature { habot="Average temperature" [ sublabel="='Last change: ' + items.state.Temperature_LastChange", leftIcon="mdi-temperature", leftColor="primary" ] }
+```
+
+Please refer to https://quasar-framework.org/components/color-palette.html and https://quasar-framework.org/components/icons.html#Basic-Usage to learn more about accepted values for colors and icons (material-icons and mdi iconsets are available in HABot).
 
 ### Bookmarked cards & Suggestions
 
@@ -130,23 +159,18 @@ You can bookmark a card and it will appear in the "Bookmarks" section. This is u
 
 Suggestions are a way to have quick access to cards that are relevant in certain contexts only. For example, you will likely need different cards depending on whether you're at home or not, or in certain parts of the day. If the temperature falls outside a certain range, you would want a card with the thermostat controls. If motion was detected while you're away, you will likely get a quick way of displaying the webcams and the sensor status. You decide when a card should be suggested with a formula you set up in the card designer. The expression syntax allows simple operations and lets you access items' statuses and (soon) the current time.
 
-Examples of expressions include `items.Temperature.state < 16` and `items.Motion_Detected.state == "ON" && items.Presence.state == "OFF"`. The [jexl](https://github.com/TomFrost/Jexl) library (not Apache JEXL) is used to evaluate expressions. Stay tuned for a more complete description of what they can do.
-Note: Some components also accept expressions in their config, for instance the HbCard title and subtitle, or the HbListItem label and sublabel. Simply prefix the expression with '=' (example: `=2+3` or `="Desired temperature: " + items.Temperature_Setpoing.state + "°C"` and it will be considered an expression/formula rather than literal text - much like Excel!
-
+Examples of expressions include `items.Temperature.state < 16` and `items.Motion_Detected.state == "ON" && items.Presence.state == "OFF"`.
 
 ### How to add HABot as a home screen app (Android)
 
-_Sorry iOS users, there is no support from Apple currently but [things might change eventually](https://m.phillydevshop.com/apples-refusal-to-support-progressive-web-apps-is-a-serious-detriment-to-future-of-the-web-e81b2be29676). You can still add the app to the home screen from Safari though, but there will no push notifications (when they're implemented) or caching._
-
-If HABot is served over HTTPS (for example, if you've connected it with myopenhab.org, it will be accessible at https://home.myopenhab.org/habot/index.html after authenticating), when navigating to the HABot page for the first time a banner should appear asking you if you'd want HABot as an app (it is supported by the Chrome, Firefox and the Samsung Internet browser) - if not, use the browser's menu:
-
-![](https://i.imgur.com/7fvD5vP.png)
+HABot is a Progressive Web App, this means if you access it over HTTPS (for example, if you've connected it with myopenhab.org, it will be accessible at https://home.myopenhab.org/habot/index.html after authenticating), a banner should appear asking you if you'd want HABot added to home screen as an app (it is supported by the Chrome, Firefox and the Samsung Internet browser) - if not, look for the option in the browser's menu. You can also add HABot to your desktop by enabling a couple of Chrome experimental flags: check https://www.xda-developers.com/progressive-web-apps-chrome-how-to/ for instructions.
 
-Using HTTPS will also unlock features only available from "secure origins", including spoken input (either with the browser's built-in recognition or a cloud service) if the browser supports it.
+Using HTTPS will also unlock features only available from "secure origins", including spoken input (either with the browser's built-in recognition or a cloud service) if the browser supports it. See the "Get the full experience" slideshow in HABot's Help page to learn more.
 
-Remember to cleanup the cache if you upgrade the app. If you're using Chrome, you can also make the browser retain your credentials with the option in the Settings.
+Remember to cleanup the cache if you upgrade the app - to speed up the loading, the browser will cache most resources using the Web Cache API, and might not always detect that they have changed. You can do so with the "Refresh the application" option in the Settings page. If you're using Chrome, you can also make the browser retain your remote access credentials with the "Store openHAB Cloud Credentials" option (this is actually not specific to openHAB Cloud but will work with all HTTP Basic authentication schemes).
 
 ## Roadmap
 
 HABot is very much a work in progress.
 You can check the roadmap in the [Projects](https://github.com/ghys/habot/projects) section. Contributions (PR) are welcome and appreciated!
+If you have feature requests or issues though, that's okay, but please consider the fact that it's first and foremost a personal pet project :)
diff --git a/src/main/java/org/openhab/ui/habot/card/Card.java b/src/main/java/org/openhab/ui/habot/card/Card.java
index cff2cc1..f69393c 100644
--- a/src/main/java/org/openhab/ui/habot/card/Card.java
+++ b/src/main/java/org/openhab/ui/habot/card/Card.java
@@ -35,6 +35,9 @@ public class Card extends Component implements Identifiable<String> {
     String title;
     String subtitle;
 
+    Set<String> objects = new HashSet<String>();
+    Set<String> locations = new HashSet<String>();
+
     Set<String> tags = new HashSet<String>();
 
     boolean bookmarked;
@@ -117,6 +120,24 @@ public Set<String> getTags() {
         return tags;
     }
 
+    /**
+     * Gets the set of object attributes attached to the card
+     *
+     * @return the card object attributes
+     */
+    public Set<String> getObjectAttributes() {
+        return objects;
+    }
+
+    /**
+     * Gets the set of location attributes attached to the card
+     *
+     * @return the card location attributes
+     */
+    public Set<String> getLocationAttributes() {
+        return tags;
+    }
+
     /**
      * Returns whether the card is bookmarked (appears on a dedicated "bookmarks" page)
      *
@@ -199,7 +220,7 @@ public void setEphemeral(boolean ephemeral) {
      * @return the timestamp
      */
     public Date getTimestamp() {
-        return this.timestamp;
+        return timestamp;
     }
 
     /**
@@ -234,7 +255,7 @@ public boolean hasTag(String tag) {
      * @param tag the tag to add
      */
     public void addTag(String tag) {
-        tags.add(tag);
+        this.tags.add(tag);
     }
 
     /**
@@ -261,14 +282,110 @@ public void addTags(String... tags) {
      * @param tag the tag to remove
      */
     public void removeTag(String tag) {
-        tags.remove(tag);
+        this.tags.remove(tag);
     }
 
     /**
      * Removes all tags on the card
      */
     public void removeAllTags() {
-        tags.clear();
+        this.tags.clear();
+    }
+
+    /**
+     * Adds an object attribute to the card
+     *
+     * @param tag the tag to add
+     */
+    public void addObjectAttribute(String object) {
+        this.objects.add(object);
+    }
+
+    /**
+     * Adds several object attributes to the card
+     *
+     * @param tags the tags to add
+     */
+    public void addObjectAttributes(Collection<String> objects) {
+        this.objects.addAll(objects);
+    }
+
+    /**
+     * Adds several object attributes to the card
+     *
+     * @param tags the tags to add
+     */
+    public void addObjectAttributes(String... objects) {
+        this.objects.addAll(Arrays.asList(objects));
+    }
+
+    /**
+     * Removes an object attribute on a card
+     *
+     * @param tag the tag to remove
+     */
+    public void removeObjectAttribute(String object) {
+        this.objects.remove(object);
+    }
+
+    /**
+     * Returns whether the card has the specified object attribute (case insensitive)
+     *
+     * @param object
+     */
+    public boolean hasObjectAttribute(String object) {
+        if (this.objects == null || object == null || object.isEmpty()) {
+            return false;
+        }
+        return this.objects.stream().anyMatch(o -> o.equalsIgnoreCase(object));
+    }
+
+    /**
+     * Adds an location attribute to the card
+     *
+     * @param tag the tag to add
+     */
+    public void addLocationAttribute(String location) {
+        this.locations.add(location);
+    }
+
+    /**
+     * Adds several object attributes to the card
+     *
+     * @param tags the tags to add
+     */
+    public void addLocationAttributes(Collection<String> locations) {
+        this.locations.addAll(locations);
+    }
+
+    /**
+     * Adds several object attributes to the card
+     *
+     * @param tags the tags to add
+     */
+    public void addLocationAttributes(String... locations) {
+        this.locations.addAll(Arrays.asList(locations));
+    }
+
+    /**
+     * Removes an object attribute on a card
+     *
+     * @param tag the tag to remove
+     */
+    public void removeLocationAttribute(String location) {
+        this.locations.remove(location);
+    }
+
+    /**
+     * Returns whether the card has the specified location attribute
+     *
+     * @param object
+     */
+    public boolean hasLocationAttribute(String location) {
+        if (this.locations == null || location == null || location.isEmpty()) {
+            return false;
+        }
+        return this.locations.stream().anyMatch(o -> o.equalsIgnoreCase(location));
     }
 
     @Override
diff --git a/src/main/java/org/openhab/ui/habot/card/CardBuilder.java b/src/main/java/org/openhab/ui/habot/card/CardBuilder.java
index 0b6bbf3..2d72ba3 100644
--- a/src/main/java/org/openhab/ui/habot/card/CardBuilder.java
+++ b/src/main/java/org/openhab/ui/habot/card/CardBuilder.java
@@ -8,12 +8,19 @@
  */
 package org.openhab.ui.habot.card;
 
+import java.util.Arrays;
 import java.util.Collection;
-import java.util.Set;
+import java.util.IllegalFormatConversionException;
+import java.util.Optional;
+import java.util.function.Supplier;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
+import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
+import org.eclipse.smarthome.core.items.Metadata;
+import org.eclipse.smarthome.core.items.MetadataKey;
+import org.eclipse.smarthome.core.items.MetadataRegistry;
 import org.eclipse.smarthome.core.library.CoreItemFactory;
 import org.eclipse.smarthome.core.transform.TransformationException;
 import org.eclipse.smarthome.core.transform.TransformationHelper;
@@ -21,20 +28,19 @@
 import org.eclipse.smarthome.core.types.StateDescription;
 import org.openhab.ui.habot.card.internal.CardRegistry;
 import org.openhab.ui.habot.nlp.Intent;
-import org.openhab.ui.habot.nlp.internal.skill.HistoryLastChangesSkill;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Reference;
 
 /**
  * Retrieves a {@link Card} to present as part of HABot's reply from a provided {@link Intent}.
  *
- * First, tries to look up in the registry ("card deck") for a card previously saved and having tags matching the
- * entities (for example: "object:temperature" + "location:kitchen").
+ * First, try to look up in the card registry ("card deck") for a card previously saved and having attributes (object
+ * and location if both are provided) matching the recognized entities.
  *
- * If so, simply use that {@link Card} - this allows the user to design new customized cards and control exactly what
- * they want to see. If no card was found, build one on the fly using the provided matching items. Note that the user
- * will be allowed the opportunity in the chat UI to add those generated cards to the card deck, with the appropriate
- * tags, and from there edit them so that they would appear with the eventual customizations the next time.
+ * If there's a match, simply use that {@link Card} - this allows the user to design new customized cards and control
+ * exactly what they want to see. If no card was found, build one on the fly using the provided matching items. Note
+ * that the user will be allowed the opportunity in the chat UI to add those generated cards to the card deck, with the
+ * appropriate tags, and from there edit them so that they would appear with the eventual customizations the next time.
  *
  * @author Yannick Schaus - Initial contribution
  */
@@ -42,7 +48,7 @@
 public class CardBuilder {
 
     private CardRegistry cardRegistry;
-    private ItemRegistry itemRegistry;
+    private MetadataRegistry metadataRegistry;
 
     /**
      * Retrieves or build a card for the specified intent and matched items
@@ -52,11 +58,10 @@ public class CardBuilder {
      * @return the card (either retrieved or built)
      */
     public Card buildCard(Intent intent, Collection<Item> matchedItems) {
-        Set<String> tags = intent.getEntities().entrySet().stream()
-                .filter(e -> e.getKey().equals("object") || e.getKey().equals("location"))
-                .map(e -> e.getKey() + ":" + e.getValue()).collect(Collectors.toSet());
+        String object = intent.getEntities().get("object");
+        String location = intent.getEntities().get("location");
 
-        Collection<Card> cardsInRegistry = this.cardRegistry.getCardByTags(tags).stream()
+        Collection<Card> cardsInRegistry = this.cardRegistry.getCardMatchingAttributes(object, location).stream()
                 .filter(c -> !c.isNotReuseableInChat() && !c.isEphemeral()).collect(Collectors.toList());
         if (cardsInRegistry.size() > 0) {
             // don't handle multiple cards, just return the first one
@@ -67,13 +72,23 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
         }
 
         Card card = new Card("HbCard");
-        card.addTags(tags);
+        if (object != null) {
+            card.addObjectAttribute(object);
+        }
+        if (location != null) {
+            card.addLocationAttribute(location);
+        }
         card.setEphemeral(true);
         card.addConfig("bigger", true);
         card.updateTimestamp();
 
-        if (matchedItems.size() == 1) {
-            Item item = matchedItems.stream().findFirst().get();
+        Supplier<Stream<Item>> matchingNonGroupItems = () -> matchedItems.stream()
+                .filter(i -> !(i instanceof GroupItem));
+
+        if (matchingNonGroupItems.get().count() == 1) {
+            Item item = matchingNonGroupItems.get().findFirst().get();
+            Metadata metadata = this.metadataRegistry.get(new MetadataKey("habot", item.getName()));
+
             card.setTitle(item.getLabel());
             card.setSubtitle(item.getName());
 
@@ -84,11 +99,13 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
                     card.addComponent("right", switchComponent);
                     break;
                 case CoreItemFactory.DIMMER:
-                    if (item.hasTag("habot:switchable")) {
+                    boolean buildKnob = (metadata != null && metadata.getConfiguration().containsKey("control")
+                            && metadata.getConfiguration().get("control").equals("knob"));
+                    if (item.hasTag("capability:Switchable")) {
                         Component dimmerSwitchComponent = new Component("HbSwitch");
                         dimmerSwitchComponent.addConfig("item", item.getName());
                         card.addComponent("right", dimmerSwitchComponent);
-                    } else if (!item.hasTag("habot:control:knob")) {
+                    } else if (!buildKnob) {
                         Component dimmerValueComponent = new Component("HbSingleItemValue");
                         dimmerValueComponent.addConfig("item", item.getName());
                         card.addComponent("right", dimmerValueComponent);
@@ -96,7 +113,7 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
 
                     Component dimmerContainerComponent = new Component("HbContainer");
                     dimmerContainerComponent.addConfig("classes", new String[] { "full-width", "text-center" });
-                    if (item.hasTag("habot:control:knob")) {
+                    if (buildKnob) {
                         Component knobComponent = new Component("HbKnob");
                         knobComponent.addConfig("item", item.getName());
                         knobComponent.addConfig("size", "200px");
@@ -153,7 +170,7 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
                     break;
                 default:
                     if (item.getType() == CoreItemFactory.IMAGE
-                            || item.getTags().stream().anyMatch(t -> t.startsWith("habot:image:sitemap:"))) {
+                            || (metadata != null && metadata.getConfiguration().containsKey("imageSitemap"))) {
                         /*
                          * If the item is an image (or a String with a tag indicating it's an image), build a
                          * HbImage component in the "media" slot
@@ -184,19 +201,45 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
             }
 
         } else {
-            card.setTitle(getCardTitleFromGroupLabels(tags));
-            card.setSubtitle(matchedItems.size() + " items"); // TODO: i18n
+            GroupItem commonGroup = getMatchingGroup(matchedItems);
+
+            if (commonGroup != null) {
+                card.setTitle(commonGroup.getLabel());
+                Item baseItem = commonGroup.getBaseItem();
+                if (baseItem != null && baseItem.getType() == CoreItemFactory.SWITCH) {
+                    Component switchComponent = new Component("HbSwitch");
+                    switchComponent.addConfig("item", commonGroup.getName());
+                    card.addComponent("right", switchComponent);
+                } else if (!commonGroup.getState().toString().isEmpty()) {
+                    Component singleItemComponent = new Component("HbSingleItemValue");
+                    singleItemComponent.addConfig("item", commonGroup.getName());
+                    card.addComponent("right", singleItemComponent);
+                }
+            } else {
+                card.setTitle(String.join(", ", intent.getEntities().values()));
+            }
+            card.setSubtitle(matchingNonGroupItems.get().count() + " items"); // TODO: i18n
 
             // TODO: detect images and build a HbCarousel with them - for webcams etc.
 
             Component list = new Component("HbList");
-            for (Item item : matchedItems) {
+            matchingNonGroupItems.get().forEach(item -> {
+                Metadata metadata = this.metadataRegistry.get(new MetadataKey("habot", item.getName()));
+
                 Component listItem = new Component("HbListItem");
                 listItem.addConfig("item", item.getName());
                 listItem.addConfig("label", item.getLabel());
+                if (metadata != null) {
+                    // Use selected keys from data as configuration for the HbListItem component
+                    for (String configKey : Arrays.asList("label", "sublabel", "leftIcon", "leftLetter", "leftColor")) {
+                        if (metadata.getConfiguration().containsKey(configKey)) {
+                            listItem.addConfig(configKey, metadata.getConfiguration().get(configKey));
+                        }
+                    }
+                }
 
                 list.addComponent("items", listItem);
-            }
+            });
 
             card.addComponent("list", list);
         }
@@ -215,27 +258,50 @@ public Card buildCard(Intent intent, Collection<Item> matchedItems) {
      * @return the card
      */
     public Card buildChartCard(Intent intent, Collection<Item> matchedItems, String period) {
-        Set<String> tags = intent.getEntities().entrySet().stream().map(e -> e.getKey() + ":" + e.getValue())
-                .collect(Collectors.toSet());
+        String object = intent.getEntities().get("object");
+        String location = intent.getEntities().get("location");
 
         Card card = new Card("HbCard");
-        card.addTags(tags);
+        if (object != null) {
+            card.addObjectAttribute(object);
+        }
+        if (location != null) {
+            card.addLocationAttribute(location);
+        }
         card.setEphemeral(true);
         card.addConfig("bigger", true);
         card.updateTimestamp();
 
-        if (matchedItems.size() == 1) {
-            Item item = matchedItems.stream().findFirst().get();
+        Supplier<Stream<Item>> matchingNonGroupItems = () -> matchedItems.stream()
+                .filter(i -> !(i instanceof GroupItem));
+
+        if (matchingNonGroupItems.get().count() == 1) {
+            Item item = matchingNonGroupItems.get().findFirst().get();
             card.setTitle(item.getLabel());
             card.setSubtitle(item.getName());
         } else {
-            card.setTitle(getCardTitleFromGroupLabels(tags));
-            card.setSubtitle(matchedItems.size() + " items"); // TODO: i18n
+            GroupItem commonGroup = getMatchingGroup(matchedItems);
+            if (commonGroup != null) {
+                card.setTitle(commonGroup.getLabel());
+                Item baseItem = commonGroup.getBaseItem();
+                if (baseItem != null && baseItem.getType() == CoreItemFactory.SWITCH) {
+                    Component switchComponent = new Component("HbSwitch");
+                    switchComponent.addConfig("item", commonGroup.getName());
+                    card.addComponent("right", switchComponent);
+                } else if (!commonGroup.getState().toString().isEmpty()) {
+                    Component singleItemComponent = new Component("HbSingleItemValue");
+                    singleItemComponent.addConfig("item", commonGroup.getName());
+                    card.addComponent("right", singleItemComponent);
+                }
+            } else {
+                card.setTitle(String.join(", ", intent.getEntities().values()));
+            }
+            card.setSubtitle(matchingNonGroupItems.get().count() + " items"); // TODO: i18n
         }
 
         Component chart = new Component("HbChartImage");
         chart.addConfig("items",
-                matchedItems.stream().map(i -> i.getName()).collect(Collectors.toList()).toArray(new String[0]));
+                matchingNonGroupItems.get().map(i -> i.getName()).collect(Collectors.toList()).toArray(new String[0]));
         chart.addConfig("period", period);
 
         Component analyzeButton = new Component("HbAnalyzeActionButton");
@@ -249,30 +315,35 @@ public Card buildChartCard(Intent intent, Collection<Item> matchedItems, String
         return card;
     }
 
-    @SuppressWarnings("null")
-    private String getCardTitleFromGroupLabels(Set<String> tags) {
-        Collection<Item> groups = this.itemRegistry.getItemsByTagAndType("Group", tags.stream().toArray(String[]::new));
-        if (groups.isEmpty()) {
-            return "";
-        } else {
-            return groups.stream().map(i -> i.getLabel()).collect(Collectors.joining(", "));
-        }
+    /**
+     * Checks whether a Group item is included in the provided collection and returns it
+     *
+     * @param items
+     * @return the first Group item in the collection
+     */
+    private GroupItem getMatchingGroup(Collection<Item> items) {
+        Optional<Item> groupItem = items.stream().filter(i -> i instanceof GroupItem).findFirst();
+        return groupItem.isPresent() ? (GroupItem) groupItem.get() : null;
     }
 
     private String formatState(Item item, State state) throws TransformationException {
         if (item.getStateDescription() != null) {
-            StateDescription stateDescription = item.getStateDescription();
-            if (stateDescription != null && stateDescription.getPattern() != null) {
-                String transformedState = TransformationHelper.transform(
-                        FrameworkUtil.getBundle(HistoryLastChangesSkill.class).getBundleContext(),
-                        stateDescription.getPattern(), state.toString());
-                if (transformedState.equals(state.toString())) {
-                    return state.format(stateDescription.getPattern());
+            try {
+                StateDescription stateDescription = item.getStateDescription();
+                if (stateDescription != null && stateDescription.getPattern() != null) {
+                    String transformedState = TransformationHelper.transform(
+                            FrameworkUtil.getBundle(CardBuilder.class).getBundleContext(),
+                            stateDescription.getPattern(), state.toString());
+                    if (transformedState.equals(state.toString())) {
+                        return state.format(stateDescription.getPattern());
+                    } else {
+                        return transformedState;
+                    }
+
                 } else {
-                    return transformedState;
+                    return state.toString();
                 }
-
-            } else {
+            } catch (IllegalFormatConversionException e) {
                 return state.toString();
             }
         } else {
@@ -290,11 +361,11 @@ protected void unsetCardRegistry(CardRegistry cardRegistry) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setMetadataRegistry(MetadataRegistry metadataRegistry) {
+        this.metadataRegistry = metadataRegistry;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetMetadataRegistry(MetadataRegistry metadataRegistry) {
+        this.metadataRegistry = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/card/internal/CardRegistry.java b/src/main/java/org/openhab/ui/habot/card/internal/CardRegistry.java
index b3e9533..f6f644e 100644
--- a/src/main/java/org/openhab/ui/habot/card/internal/CardRegistry.java
+++ b/src/main/java/org/openhab/ui/habot/card/internal/CardRegistry.java
@@ -57,6 +57,24 @@ public Collection<Card> getCardByTags(Set<String> tags) {
         return filteredCards;
     }
 
+    /**
+     * Returns cards matching the specified object and/or location attribute(s)
+     *
+     * @param object optional object attribute
+     * @param location optional location attribute
+     * @return matching cards - if one of the 2 arguments is not or empty, matching cards do NOT have the attribute. If
+     *         both are provided, matching cards have both.
+     */
+    public Collection<Card> getCardMatchingAttributes(String object, String location) {
+        List<Card> filteredCards = new ArrayList<Card>();
+        for (Card card : getAll()) {
+            if (cardMatchesAttributes(card, object, location)) {
+                filteredCards.add(card);
+            }
+        }
+        return filteredCards;
+    }
+
     @Override
     public @NonNull Card add(@NonNull Card element) {
         // Remove old ephemeral cards
@@ -104,6 +122,13 @@ private boolean cardHasTags(Card card, Set<String> tags) {
         return (tags != null && card.getTags() != null && card.getTags().equals(tags));
     }
 
+    private boolean cardMatchesAttributes(Card card, String object, String location) {
+        boolean objectMatches = (object == null || object.isEmpty()) ^ card.hasObjectAttribute(object);
+        boolean locationMatches = (location == null || location.isEmpty()) ^ card.hasLocationAttribute(location);
+
+        return objectMatches && locationMatches;
+    }
+
     @Reference(cardinality = ReferenceCardinality.OPTIONAL, policy = ReferencePolicy.DYNAMIC)
     protected void setManagedProvider(CardProvider provider) {
         super.setManagedProvider(provider);
diff --git a/src/main/java/org/openhab/ui/habot/nlp/AbstractItemIntentInterpreter.java b/src/main/java/org/openhab/ui/habot/nlp/AbstractItemIntentInterpreter.java
index 67aad9d..756a719 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/AbstractItemIntentInterpreter.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/AbstractItemIntentInterpreter.java
@@ -9,15 +9,13 @@
 package org.openhab.ui.habot.nlp;
 
 import java.io.InputStream;
-import java.util.Collection;
-import java.util.HashSet;
 import java.util.Set;
 import java.util.stream.Collectors;
 
-import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
 import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.nlp.internal.AnswerFormatter;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 
 /**
  * An abstract implmentation of a {@link Skill} with helper methods to find items matching an {@link Intent}
@@ -30,11 +28,13 @@
 public abstract class AbstractItemIntentInterpreter implements Skill {
 
     protected ItemRegistry itemRegistry;
+    protected ItemNamedAttributesResolver itemNamedAttributesResolver;
     protected AnswerFormatter answerFormatter;
 
     /**
-     * Returns the items matching the entities in the intent by looking for tags prefixed by "object:" or "location:".
-     * Group items are expanded and the tags, and tags are inherited to members.
+     * Returns the items matching the entities in the intent.
+     * It delegates this task to the {@link ItemNamedAttributesResolver} to find named attributes
+     * matching the entities.
      *
      * The resulting items should match the object AND the location if both are provided.
      *
@@ -42,56 +42,10 @@ public abstract class AbstractItemIntentInterpreter implements Skill {
      * @return the set of matching items
      */
     protected Set<Item> findItems(Intent intent) {
-        Collection<Item> itemsWithLocationTag = null;
-        if (intent.entities.containsKey("location")) {
-            itemsWithLocationTag = itemRegistry.getItemsByTag("location:" + intent.entities.get("location"));
-        }
-
-        Collection<Item> itemsWithObjectTag = null;
-        if (intent.entities.containsKey("object")) {
-            itemsWithObjectTag = itemRegistry.getItemsByTag("object:" + intent.entities.get("object"));
-        }
-
-        HashSet<Item> itemsMatchingLocationSlot = null;
-        if (itemsWithLocationTag != null) {
-            itemsMatchingLocationSlot = new HashSet<Item>();
-            for (Item item : itemsWithLocationTag) {
-                if (item instanceof GroupItem) {
-                    GroupItem groupItem = (GroupItem) item;
-                    for (Item member : groupItem.getAllMembers()) {
-                        itemsMatchingLocationSlot.add(member);
-                    }
-                } else {
-                    itemsMatchingLocationSlot.add(item);
-                }
-            }
-        }
+        String object = intent.getEntities().get("object");
+        String location = intent.getEntities().get("location");
 
-        HashSet<Item> itemsMatchingObjectSlot = null;
-        if (itemsWithObjectTag != null) {
-            itemsMatchingObjectSlot = new HashSet<Item>();
-            for (Item item : itemsWithObjectTag) {
-                if (item instanceof GroupItem) {
-                    GroupItem groupItem = (GroupItem) item;
-                    for (Item member : groupItem.getAllMembers()) {
-                        itemsMatchingObjectSlot.add(member);
-                    }
-                } else {
-                    itemsMatchingObjectSlot.add(item);
-                }
-            }
-        }
-
-        if (itemsMatchingLocationSlot == null && itemsMatchingObjectSlot == null) {
-            return null;
-        } else if (itemsMatchingObjectSlot == null) {
-            return itemsMatchingLocationSlot;
-        } else if (itemsMatchingLocationSlot == null) {
-            return itemsMatchingObjectSlot;
-        } else {
-            return itemsMatchingLocationSlot.stream().filter(itemsMatchingObjectSlot::contains)
-                    .collect(Collectors.toSet());
-        }
+        return this.itemNamedAttributesResolver.getMatchingItems(object, location).collect(Collectors.toSet());
     }
 
     @Override
@@ -107,5 +61,4 @@ public InputStream getTrainingData(String language) throws UnsupportedLanguageEx
 
         return trainingData;
     }
-
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/IntentInterpretation.java b/src/main/java/org/openhab/ui/habot/nlp/IntentInterpretation.java
index fa93e94..4c27f93 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/IntentInterpretation.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/IntentInterpretation.java
@@ -93,7 +93,7 @@ public Card getCard() {
     }
 
     /**
-     * Gets the {@link Card} presented as part of the answer.
+     * Sets the {@link Card} presented as part of the answer.
      *
      * @param card the card
      */
diff --git a/src/main/java/org/openhab/ui/habot/nlp/ItemNamedAttribute.java b/src/main/java/org/openhab/ui/habot/nlp/ItemNamedAttribute.java
new file mode 100644
index 0000000..d71e1bb
--- /dev/null
+++ b/src/main/java/org/openhab/ui/habot/nlp/ItemNamedAttribute.java
@@ -0,0 +1,156 @@
+/**
+ * Copyright (c) 2010-2018 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.openhab.ui.habot.nlp;
+
+/**
+ * This class repesents a named attribute, which be used for matching entities
+ * extracted from the natural language query to items. They originate from
+ * semantic tags and additional monikers defined in the item's "habot" namespace.
+ *
+ * @author Yannick Schaus
+ */
+public class ItemNamedAttribute {
+    public enum AttributeSource {
+        TAG,
+        METADATA
+    }
+
+    public ItemNamedAttribute(String type, String value, boolean inherited, AttributeSource source) {
+        super();
+        this.type = type;
+        this.value = value;
+        this.inherited = inherited;
+        this.source = source;
+    }
+
+    String type;
+    String value;
+    boolean inherited;
+    AttributeSource source;
+
+    /**
+     * Retrieves the type of the named attribute - "object" or "location"
+     *
+     * @return the type - "object" or "location"
+     */
+    public String getType() {
+        return type;
+    }
+
+    /**
+     * Sets the type of the named attribute
+     *
+     * @param type the type
+     */
+    public void setType(String type) {
+        this.type = type;
+    }
+
+    /**
+     * Retrieves the value of the named attribute
+     *
+     * @return the value
+     */
+    public String getValue() {
+        return value;
+    }
+
+    /**
+     * Sets the value of the named attribute
+     *
+     * @param value the value
+     */
+    public void setValue(String value) {
+        this.value = value;
+    }
+
+    /**
+     * Returns whether this named attribute is inherited or not
+     *
+     * @return whether the named attribute is inherited
+     */
+    public boolean isInherited() {
+        return inherited;
+    }
+
+    /**
+     * Specifies whether this named attribute is inherited
+     *
+     * @param inherited whether the named attribute is inherited
+     */
+    public void setInherited(boolean inherited) {
+        this.inherited = inherited;
+    }
+
+    /**
+     * Returns whether the named attribute comes from a tag or metadata
+     *
+     * @return the source of the named attribute
+     */
+    public AttributeSource getSource() {
+        return source;
+    }
+
+    /**
+     * Specifies whether the named attribute comes from a tag or metadata
+     *
+     * @param source the source the named attribute
+     */
+    public void setSource(AttributeSource source) {
+        this.source = source;
+    }
+
+    @Override
+    public int hashCode() {
+        final int prime = 31;
+        int result = 1;
+        result = prime * result + (inherited ? 1231 : 1237);
+        result = prime * result + ((source == null) ? 0 : source.hashCode());
+        result = prime * result + ((type == null) ? 0 : type.hashCode());
+        result = prime * result + ((value == null) ? 0 : value.hashCode());
+        return result;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        ItemNamedAttribute other = (ItemNamedAttribute) obj;
+        // doesn't matter
+        // if (inherited != other.inherited) {
+        // return false;
+        // }
+        // if (source != other.source) {
+        // return false;
+        // }
+        if (type == null) {
+            if (other.type != null) {
+                return false;
+            }
+        } else if (!type.equals(other.type)) {
+            return false;
+        }
+        if (value == null) {
+            if (other.value != null) {
+                return false;
+            }
+        } else if (!value.equals(other.value)) {
+            return false;
+        }
+        return true;
+    }
+
+}
diff --git a/src/main/java/org/openhab/ui/habot/nlp/UnsupportedLanguageException.java b/src/main/java/org/openhab/ui/habot/nlp/UnsupportedLanguageException.java
index 5c75ad1..1907c7e 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/UnsupportedLanguageException.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/UnsupportedLanguageException.java
@@ -31,8 +31,12 @@ public UnsupportedLanguageException(String language) {
         this.language = Locale.forLanguageTag(language);
     }
 
+    public UnsupportedLanguageException(Locale locale) {
+        this.language = locale;
+    }
+
     @Override
     public String getMessage() {
-        return "Unsupported language: " + language.toString();
+        return String.format("Unsupported language: %s", language.toString());
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/AnswerFormatter.java b/src/main/java/org/openhab/ui/habot/nlp/internal/AnswerFormatter.java
index 38f3fad..ae729ad 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/AnswerFormatter.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/AnswerFormatter.java
@@ -60,8 +60,10 @@ public String getRandomAnswer(String key) {
 
     public String getStandardTagHint(Map<String, String> entities) {
         return getRandomAnswer("standard_hint",
-                ImmutableMap.of("tags", String.join(" & ", entities.entrySet().stream()
-                        .filter(e -> e.getKey().equals("object") || e.getKey().equals("location"))
-                        .map(e -> String.format("\"%s:%s\"", e.getKey(), e.getValue())).toArray(String[]::new))));
+                ImmutableMap.of("attributes",
+                        String.join(" & ",
+                                entities.entrySet().stream()
+                                        .filter(e -> e.getKey().equals("object") || e.getKey().equals("location"))
+                                        .map(e -> String.format("\"%s\"", e.getValue())).toArray(String[]::new))));
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/ItemNamedAttributesResolver.java b/src/main/java/org/openhab/ui/habot/nlp/internal/ItemNamedAttributesResolver.java
new file mode 100644
index 0000000..c2c1d92
--- /dev/null
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/ItemNamedAttributesResolver.java
@@ -0,0 +1,277 @@
+/**
+ * Copyright (c) 2010-2018 by the respective copyright holders.
+ *
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ */
+package org.openhab.ui.habot.nlp.internal;
+
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Locale;
+import java.util.Map;
+import java.util.MissingResourceException;
+import java.util.ResourceBundle;
+import java.util.Set;
+import java.util.stream.Stream;
+
+import org.eclipse.jdt.annotation.NonNull;
+import org.eclipse.smarthome.core.common.registry.RegistryChangeListener;
+import org.eclipse.smarthome.core.items.GroupItem;
+import org.eclipse.smarthome.core.items.Item;
+import org.eclipse.smarthome.core.items.ItemRegistry;
+import org.eclipse.smarthome.core.items.Metadata;
+import org.eclipse.smarthome.core.items.MetadataKey;
+import org.eclipse.smarthome.core.items.MetadataRegistry;
+import org.openhab.ui.habot.nlp.ItemNamedAttribute;
+import org.openhab.ui.habot.nlp.ItemNamedAttribute.AttributeSource;
+import org.openhab.ui.habot.nlp.UnsupportedLanguageException;
+import org.osgi.service.component.annotations.Component;
+import org.osgi.service.component.annotations.Reference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * This class retrieves and caches sets of {@link ItemNamedAttribute} mapped to items.
+ * It uses semantic tags and additional monikers defined in metadata ("habot" namespace).
+ * The named attributes sourced from tags will be translated to the current language as
+ * specified. Inheritance is always applied for metadata, while for tags it can be prevented
+ * with the "inheritTags" configuration property in the "habot" metadata namespace.
+ *
+ * @author Yannick Schaus
+ */
+@Component(service = ItemNamedAttributesResolver.class, immediate = true)
+public class ItemNamedAttributesResolver {
+
+    private final Logger logger = LoggerFactory.getLogger(ItemNamedAttributesResolver.class);
+
+    private ItemRegistry itemRegistry;
+    private MetadataRegistry metadataRegistry;
+    private Map<Item, Set<ItemNamedAttribute>> itemAttributes;
+    private Locale currentLocale = null;
+    ResourceBundle tagAttributes;
+
+    /**
+     * Sets the current locale.
+     * Attributes derived from semantic tags will use this locale.
+     * This will invalidate the attribute cache.
+     *
+     * @param locale
+     */
+    public void setLocale(Locale locale) {
+        if (!locale.equals(currentLocale)) {
+            this.currentLocale = locale;
+            logger.debug("Language set to: %s - invalidating cached item named attributes", locale.getLanguage());
+            this.itemAttributes = null;
+            this.tagAttributes = ResourceBundle.getBundle("tagattributes", locale,
+                    ResourceBundle.Control.getNoFallbackControl(ResourceBundle.Control.FORMAT_DEFAULT));
+
+        }
+    }
+
+    /**
+     * Returns a map of all named attributes by item.
+     *
+     * @return attributes mapped by item
+     * @throws UnsupportedLanguageException
+     */
+    public Map<Item, Set<ItemNamedAttribute>> getAllItemNamedAttributes() throws UnsupportedLanguageException {
+        if (currentLocale == null) {
+            throw new UnsupportedLanguageException(currentLocale);
+        }
+
+        if (itemAttributes == null) {
+            updateItemNamedAttributes();
+        }
+
+        return itemAttributes;
+    }
+
+    /**
+     * Returns the set of named attributes associated to the provided item
+     *
+     * @param item the item to look up
+     * @return a set of named attributes or null if the item doesn't have any named attributes
+     * @throws UnsupportedLanguageException
+     */
+    public Set<ItemNamedAttribute> getItemNamedAttributes(Item item) throws UnsupportedLanguageException {
+        if (currentLocale == null) {
+            throw new UnsupportedLanguageException(currentLocale);
+        }
+
+        if (itemAttributes == null) {
+            updateItemNamedAttributes();
+        }
+
+        return itemAttributes.get(item);
+    }
+
+    /**
+     * Returns items having attributes matching the provided object and locations.
+     * Both have to match if provided.
+     *
+     * @param object the object to find in the attributes
+     * @param location the location to find in the attribute
+     * @return a stream of matching items (groups included)
+     */
+    public Stream<Item> getMatchingItems(String object, String location) {
+        return itemAttributes.entrySet().stream().filter(entry -> {
+            boolean objectMatch = false;
+            boolean locationMatch = false;
+
+            if (object != null && entry.getValue().stream().anyMatch(a -> a.getValue().equalsIgnoreCase(object))) {
+                objectMatch = true;
+            }
+            if (location != null && entry.getValue().stream().anyMatch(a -> a.getValue().equalsIgnoreCase(location))) {
+                locationMatch = true;
+            }
+
+            return (object != null && location != null) ? objectMatch && locationMatch : objectMatch || locationMatch;
+        }).map(entry -> entry.getKey());
+    }
+
+    private void updateItemNamedAttributes() {
+        itemAttributes = new HashMap<Item, Set<ItemNamedAttribute>>();
+        for (Item item : itemRegistry.getAll()) {
+
+            Metadata metadata = metadataRegistry.get(new MetadataKey("habot", item.getName()));
+
+            // look for semantic tags
+            for (String tag : item.getTags()) {
+                if (tag.split(":").length != 2) {
+                    continue;
+                }
+
+                String type = tag.startsWith("location:") ? "location" : "object";
+
+                String semanticTagNamedAttributes;
+                try {
+                    boolean inheritTag = true;
+                    if (metadata != null && metadata.getConfiguration().containsKey("inheritTags")) {
+                        inheritTag = (boolean) metadata.getConfiguration().get("inheritTags");
+                    }
+                    semanticTagNamedAttributes = this.tagAttributes.getString(tag.split(":")[1].toLowerCase());
+                    for (String tagAttribute : semanticTagNamedAttributes.split(",")) {
+                        addItemAttribute(item, type, tagAttribute.trim(), AttributeSource.TAG, false, inheritTag);
+                    }
+                } catch (MissingResourceException e) {
+                    logger.debug("No named attributes found for tag {}", tag);
+                }
+            }
+
+            // look for additional comma-separated item monikers in the "habot" metadata namespace
+            if (metadata != null && !(metadata.getValue().isEmpty())) {
+                String type = "object";
+
+                if (item instanceof GroupItem && item.getTags().stream().anyMatch(t -> t.startsWith("location:"))) {
+                    type = "location";
+                }
+                if (metadata.getConfiguration().containsKey("type")) {
+                    type = metadata.getConfiguration().get("type").toString();
+                }
+
+                for (String moniker : metadata.getValue().split(",")) {
+                    // monikers in metadata ARE inherited
+                    addItemAttribute(item, type, moniker.trim(), AttributeSource.METADATA, false, true);
+                }
+            }
+        }
+    }
+
+    private void addItemAttribute(Item item, String type, String value, AttributeSource source, boolean isInherited,
+            boolean inheritToGroupMembers) {
+        Set<ItemNamedAttribute> attributes = itemAttributes.get(item);
+        if (attributes == null) {
+            attributes = new HashSet<ItemNamedAttribute>();
+        }
+
+        ItemNamedAttribute attribute = new ItemNamedAttribute(type, value, isInherited, source);
+        attributes.add(attribute);
+
+        if (item instanceof GroupItem && inheritToGroupMembers) {
+            for (Item groupMemberItem : ((GroupItem) item).getMembers(i -> true)) {
+                addItemAttribute(groupMemberItem, type, value, source, true, true);
+            }
+        }
+
+        itemAttributes.put(item, attributes);
+    }
+
+    @Reference
+    protected void setItemRegistry(ItemRegistry itemRegistry) {
+        if (this.itemRegistry == null) {
+            this.itemRegistry = itemRegistry;
+            this.itemRegistry.addRegistryChangeListener(registryChangeListener);
+        }
+    }
+
+    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
+        if (itemRegistry == this.itemRegistry) {
+            this.itemRegistry.removeRegistryChangeListener(registryChangeListener);
+            this.itemRegistry = null;
+        }
+    }
+
+    @Reference
+    protected void setMetadataRegistry(MetadataRegistry metadataRegistry) {
+        if (this.metadataRegistry == null) {
+            this.metadataRegistry = metadataRegistry;
+            this.metadataRegistry.addRegistryChangeListener(metadataRegistryChangeListener);
+        }
+    }
+
+    protected void unsetMetadataRegistry(MetadataRegistry metadataRegistry) {
+        if (metadataRegistry == this.metadataRegistry) {
+            this.metadataRegistry.removeRegistryChangeListener(metadataRegistryChangeListener);
+            this.metadataRegistry = null;
+        }
+    }
+
+    private @NonNull RegistryChangeListener<Item> registryChangeListener = new RegistryChangeListener<Item>() {
+        @Override
+        public void added(Item element) {
+            logger.debug("Invalidating cached item named attributes");
+            itemAttributes = null;
+        }
+
+        @Override
+        public void removed(Item element) {
+            logger.debug("Invalidating cached item named attributes");
+            itemAttributes = null;
+        }
+
+        @Override
+        public void updated(Item oldElement, Item element) {
+            logger.debug("Invalidating cached item named attributes");
+            itemAttributes = null;
+        }
+    };
+
+    private @NonNull RegistryChangeListener<Metadata> metadataRegistryChangeListener = new RegistryChangeListener<Metadata>() {
+        @Override
+        public void added(Metadata element) {
+            if (element.getUID().getNamespace() == "habot") {
+                logger.debug("Invalidating cached item named attributes");
+                itemAttributes = null;
+            }
+        }
+
+        @Override
+        public void removed(Metadata element) {
+            if (element.getUID().getNamespace() == "habot") {
+                logger.debug("Invalidating cached item named attributes");
+                itemAttributes = null;
+            }
+        }
+
+        @Override
+        public void updated(Metadata oldElement, Metadata element) {
+            if (element.getUID().getNamespace() == "habot") {
+                logger.debug("Invalidating cached item named attributes");
+                itemAttributes = null;
+            }
+        }
+    };
+}
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java b/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java
index 98c4558..ddbf453 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/OpenNLPInterpreter.java
@@ -10,7 +10,6 @@
 
 import java.io.InputStream;
 import java.util.Arrays;
-import java.util.Collection;
 import java.util.Collections;
 import java.util.Comparator;
 import java.util.HashMap;
@@ -19,6 +18,7 @@
 import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import org.apache.commons.io.IOUtils;
 import org.eclipse.jdt.annotation.NonNull;
@@ -31,7 +31,9 @@
 import org.openhab.ui.habot.nlp.ChatReply;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
+import org.openhab.ui.habot.nlp.ItemNamedAttribute;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.UnsupportedLanguageException;
 import org.osgi.framework.BundleContext;
 import org.osgi.service.component.annotations.Activate;
 import org.osgi.service.component.annotations.Component;
@@ -51,7 +53,7 @@
         "service.config.category=voice" })
 public class OpenNLPInterpreter implements HumanLanguageInterpreter {
 
-    private static final Set<Locale> SUPPORTED_LOCALES = Collections
+    public static final Set<Locale> SUPPORTED_LOCALES = Collections
             .unmodifiableSet(new HashSet<>(Arrays.asList(Locale.ENGLISH, Locale.FRENCH, Locale.GERMAN)));
 
     private IntentTrainer intentTrainer = null;
@@ -59,6 +61,7 @@ public class OpenNLPInterpreter implements HumanLanguageInterpreter {
     private String tokenizerId = null;
 
     private ItemRegistry itemRegistry;
+    private ItemNamedAttributesResolver itemNamedAttributesResolver;
     private EventPublisher eventPublisher;
 
     private HashMap<String, Skill> skills = new HashMap<String, Skill>();
@@ -66,25 +69,17 @@ public class OpenNLPInterpreter implements HumanLanguageInterpreter {
     private @NonNull RegistryChangeListener<Item> registryChangeListener = new RegistryChangeListener<Item>() {
         @Override
         public void added(Item element) {
-            // Only invalidate the trainer if the new item has tags
-            if (element.getTags().stream().anyMatch(tag -> tag.startsWith("object:") || tag.startsWith("location:"))) {
-                intentTrainer = null;
-            }
+            intentTrainer = null;
         }
 
         @Override
         public void removed(Item element) {
-            // Only invalidate the trainer if the removed item had tags
-            if (element.getTags().stream().anyMatch(tag -> tag.startsWith("object:") || tag.startsWith("location:"))) {
-                intentTrainer = null;
-            }
+            intentTrainer = null;
         }
 
         @Override
         public void updated(Item oldElement, Item element) {
-            if (!element.getTags().equals(oldElement.getTags())) {
-                intentTrainer = null;
-            }
+            intentTrainer = null;
         }
     };
 
@@ -108,18 +103,20 @@ public String interpret(Locale locale, String text) throws InterpretationExcepti
         return reply.getAnswer();
     }
 
-    private InputStream getNameFinderTrainingDataFromTags() {
+    private InputStream getNameSamplesFromItems(Locale locale) throws UnsupportedLanguageException {
         StringBuilder nameSamplesDoc = new StringBuilder();
-        Collection<Item> items = itemRegistry.getItems();
-        for (Item item : items) {
-            for (String tag : item.getTags()) {
-                if (tag.startsWith("object:")) {
-                    nameSamplesDoc.append(String.format("<START:object> %s <END>%n", tag.split(":")[1]));
-                } else if (tag.startsWith("location:")) {
-                    nameSamplesDoc.append(String.format("<START:location> %s <END>%n", tag.split(":")[1]));
-                }
+        itemNamedAttributesResolver.setLocale(locale);
+        Map<Item, Set<ItemNamedAttribute>> itemAttributes = itemNamedAttributesResolver.getAllItemNamedAttributes();
+
+        Stream<ItemNamedAttribute> attributes = itemAttributes.values().stream().flatMap(a -> a.stream());
+
+        attributes.forEach(attribute -> {
+            if (attribute.getType() == "location") {
+                nameSamplesDoc.append(String.format("<START:location> %s <END>%n", attribute.getValue()));
+            } else {
+                nameSamplesDoc.append(String.format("<START:object> %s <END>%n", attribute.getValue()));
             }
-        }
+        });
 
         return IOUtils.toInputStream(nameSamplesDoc.toString());
     }
@@ -149,7 +146,7 @@ public int compare(Skill o1, Skill o2) {
                                 return o1.getIntentId().compareTo(o2.getIntentId());
                             }
 
-                        }).collect(Collectors.toList()), getNameFinderTrainingDataFromTags(), this.tokenizerId);
+                        }).collect(Collectors.toList()), getNameSamplesFromItems(locale), this.tokenizerId);
                 currentLocale = locale;
             } catch (Exception e) {
                 InterpretationException fe = new InterpretationException(
@@ -163,15 +160,15 @@ public int compare(Skill o1, Skill o2) {
 
         Intent intent;
 
-        // Shortcut: if there are any items whose object: or location: tags match the query (case insensitive), consider
-        // it a "get-status" intent with this tags as the corresponding entity.
-        // This allows the user to query a tag quickly by simply stating it - and avoid a misinterpretation by the
-        // categorizer.
-        if (!this.itemRegistry.getItemsByTag("object:" + text.toLowerCase()).isEmpty()) {
+        // Shortcut: if there are any items whose named attributes match the query (case insensitive), consider
+        // it a "get-status" intent with this attribute as the corresponding entity.
+        // This allows the user to query a named attribute quickly by simply stating it - and avoid a
+        // misinterpretation by the categorizer.
+        if (this.itemNamedAttributesResolver.getMatchingItems(text, null).findAny().isPresent()) {
             intent = new Intent("get-status");
             intent.setEntities(new HashMap<String, String>());
             intent.getEntities().put("object", text.toLowerCase());
-        } else if (!this.itemRegistry.getItemsByTag("location:" + text.toLowerCase()).isEmpty()) {
+        } else if (this.itemNamedAttributesResolver.getMatchingItems(null, text).findAny().isPresent()) {
             intent = new Intent("get-status");
             intent.setEntities(new HashMap<String, String>());
             intent.getEntities().put("location", text.toLowerCase());
@@ -232,6 +229,15 @@ protected void unsetItemRegistry(ItemRegistry itemRegistry) {
         }
     }
 
+    @Reference
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
+    }
+
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
+    }
+
     @Reference
     protected void setEventPublisher(EventPublisher eventPublisher) {
         if (this.eventPublisher == null) {
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/ActivateObjectSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/ActivateObjectSkill.java
index ca4d6d6..7e8374b 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/ActivateObjectSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/ActivateObjectSkill.java
@@ -13,8 +13,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
+import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.items.events.ItemEventFactory;
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.openhab.ui.habot.card.CardBuilder;
@@ -22,6 +22,7 @@
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 import com.google.common.collect.ImmutableMap;
@@ -56,7 +57,8 @@ public IntentInterpretation interpret(Intent intent, String language) {
 
             // filter out the items which can't receive an ON command
             List<Item> filteredItems = matchedItems.stream()
-                    .filter(i -> i.getAcceptedCommandTypes().contains(OnOffType.class)).collect(Collectors.toList());
+                    .filter(i -> !(i instanceof GroupItem) && i.getAcceptedCommandTypes().contains(OnOffType.class))
+                    .collect(Collectors.toList());
 
             interpretation.setCard(cardBuilder.buildCard(intent, filteredItems));
 
@@ -93,12 +95,12 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 
     @Reference
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/DeactivateObjectSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/DeactivateObjectSkill.java
index 0727ee2..e88c343 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/DeactivateObjectSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/DeactivateObjectSkill.java
@@ -13,8 +13,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
+import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.items.events.ItemEventFactory;
 import org.eclipse.smarthome.core.library.types.OnOffType;
 import org.openhab.ui.habot.card.CardBuilder;
@@ -22,6 +22,7 @@
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 import com.google.common.collect.ImmutableMap;
@@ -56,7 +57,8 @@ public IntentInterpretation interpret(Intent intent, String language) {
 
             // filter out the items which can't receive an OFF command
             List<Item> filteredItems = matchedItems.stream()
-                    .filter(i -> i.getAcceptedCommandTypes().contains(OnOffType.class)).collect(Collectors.toList());
+                    .filter(i -> !(i instanceof GroupItem) && i.getAcceptedCommandTypes().contains(OnOffType.class))
+                    .collect(Collectors.toList());
 
             interpretation.setCard(cardBuilder.buildCard(intent, filteredItems));
 
@@ -93,12 +95,12 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 
     @Reference
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/GetStatusSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/GetStatusSkill.java
index 556c53d..1423fed 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/GetStatusSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/GetStatusSkill.java
@@ -11,12 +11,12 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.card.CardBuilder;
 import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -62,11 +62,11 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryDailyGraphSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryDailyGraphSkill.java
index 7c45987..1033858 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryDailyGraphSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryDailyGraphSkill.java
@@ -11,12 +11,12 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.card.CardBuilder;
 import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -68,11 +68,11 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryHourlyGraphSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryHourlyGraphSkill.java
index 24c205a..1ec1c60 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryHourlyGraphSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryHourlyGraphSkill.java
@@ -11,12 +11,12 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.card.CardBuilder;
 import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -68,11 +68,11 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryLastChangesSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryLastChangesSkill.java
index 182954b..d848697 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryLastChangesSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryLastChangesSkill.java
@@ -15,7 +15,6 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.persistence.HistoricItem;
 import org.eclipse.smarthome.core.transform.TransformationException;
 import org.eclipse.smarthome.core.transform.TransformationHelper;
@@ -29,6 +28,7 @@
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.framework.FrameworkUtil;
 import org.osgi.service.component.annotations.Reference;
 
@@ -135,12 +135,12 @@ private String formatState(Item item, State state) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 
     @Reference
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryMonthlyGraphSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryMonthlyGraphSkill.java
index 09a4ee8..37895b7 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryMonthlyGraphSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryMonthlyGraphSkill.java
@@ -11,12 +11,12 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.card.CardBuilder;
 import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -68,11 +68,11 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryWeeklyGraphSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryWeeklyGraphSkill.java
index 335c328..37a3949 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryWeeklyGraphSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/HistoryWeeklyGraphSkill.java
@@ -11,12 +11,12 @@
 import java.util.Set;
 
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.openhab.ui.habot.card.CardBuilder;
 import org.openhab.ui.habot.nlp.AbstractItemIntentInterpreter;
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 /**
@@ -68,11 +68,11 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/SetValueSkill.java b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/SetValueSkill.java
index 454c68b..8394ec4 100644
--- a/src/main/java/org/openhab/ui/habot/nlp/internal/skill/SetValueSkill.java
+++ b/src/main/java/org/openhab/ui/habot/nlp/internal/skill/SetValueSkill.java
@@ -16,8 +16,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.smarthome.core.events.EventPublisher;
+import org.eclipse.smarthome.core.items.GroupItem;
 import org.eclipse.smarthome.core.items.Item;
-import org.eclipse.smarthome.core.items.ItemRegistry;
 import org.eclipse.smarthome.core.items.events.ItemEventFactory;
 import org.eclipse.smarthome.core.library.types.DecimalType;
 import org.eclipse.smarthome.core.library.types.HSBType;
@@ -27,6 +27,7 @@
 import org.openhab.ui.habot.nlp.Intent;
 import org.openhab.ui.habot.nlp.IntentInterpretation;
 import org.openhab.ui.habot.nlp.Skill;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.osgi.service.component.annotations.Reference;
 
 import com.google.common.collect.ImmutableMap;
@@ -78,7 +79,8 @@ private void interpretSetColor(Intent intent, String language, IntentInterpretat
 
         // filter out the items which can't receive an HSB command
         List<Item> filteredItems = matchedItems.stream()
-                .filter(i -> i.getAcceptedCommandTypes().contains(HSBType.class)).collect(Collectors.toList());
+                .filter(i -> !(i instanceof GroupItem) && i.getAcceptedCommandTypes().contains(HSBType.class))
+                .collect(Collectors.toList());
 
         String hsbValue;
         try {
@@ -120,7 +122,7 @@ private void interpretSetValue(Intent intent, String language, IntentInterpretat
 
         // only consider items which can receive an DecimalType command - includes PercentType, HSBType
         List<Item> filteredItems = matchedItems.stream()
-                .filter(i -> i.getAcceptedCommandTypes().contains(DecimalType.class)
+                .filter(i -> !(i instanceof GroupItem) && i.getAcceptedCommandTypes().contains(DecimalType.class)
                         || i.getAcceptedCommandTypes().contains(PercentType.class))
                 .collect(Collectors.toList());
 
@@ -159,12 +161,12 @@ protected void unsetCardBuilder(CardBuilder cardBuilder) {
     }
 
     @Reference
-    protected void setItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = itemRegistry;
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
     }
 
-    protected void unsetItemRegistry(ItemRegistry itemRegistry) {
-        this.itemRegistry = null;
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
     }
 
     @Reference
diff --git a/src/main/java/org/openhab/ui/habot/notification/internal/ModuleHandlerFactoryStarter.java b/src/main/java/org/openhab/ui/habot/notification/internal/ModuleHandlerFactoryStarter.java
index 96dcdb4..0838fa4 100644
--- a/src/main/java/org/openhab/ui/habot/notification/internal/ModuleHandlerFactoryStarter.java
+++ b/src/main/java/org/openhab/ui/habot/notification/internal/ModuleHandlerFactoryStarter.java
@@ -33,8 +33,7 @@ protected void activate(ComponentContext context) {
             logger.info("WebPushNotificationModuleHandlerFactory started by ModuleHandlerFactoryStarter");
         } catch (NoClassDefFoundError e) {
             logger.info(
-                    "Not registering WebPushNotificationModuleHandlerFactory - make sure the automation engine add-on is installed",
-                    e);
+                    "Not registering WebPushNotificationModuleHandlerFactory - make sure the automation engine add-on is installed");
         }
     }
 
@@ -44,8 +43,7 @@ protected void deactivate(ComponentContext context) {
             context.disableComponent(WebPushNotificationModuleHandlerFactory.class.getName());
         } catch (NoClassDefFoundError e) {
             logger.info(
-                    "Not unregistering WebPushNotificationModuleHandlerFactory - make sure the automation engine add-on is installed",
-                    e);
+                    "Not unregistering WebPushNotificationModuleHandlerFactory - make sure the automation engine add-on is installed");
         }
     }
 }
diff --git a/src/main/java/org/openhab/ui/habot/rest/internal/HABotResource.java b/src/main/java/org/openhab/ui/habot/rest/internal/HABotResource.java
index 581e4cb..ca3bdb1 100644
--- a/src/main/java/org/openhab/ui/habot/rest/internal/HABotResource.java
+++ b/src/main/java/org/openhab/ui/habot/rest/internal/HABotResource.java
@@ -11,6 +11,9 @@
 import java.security.InvalidParameterException;
 import java.util.Collection;
 import java.util.Locale;
+import java.util.Set;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 import javax.annotation.security.RolesAllowed;
 import javax.ws.rs.Consumes;
@@ -38,7 +41,9 @@
 import org.openhab.ui.habot.card.Card;
 import org.openhab.ui.habot.card.internal.CardRegistry;
 import org.openhab.ui.habot.nlp.ChatReply;
+import org.openhab.ui.habot.nlp.ItemNamedAttribute;
 import org.openhab.ui.habot.nlp.internal.AnswerFormatter;
+import org.openhab.ui.habot.nlp.internal.ItemNamedAttributesResolver;
 import org.openhab.ui.habot.nlp.internal.OpenNLPInterpreter;
 import org.openhab.ui.habot.notification.internal.NotificationService;
 import org.openhab.ui.habot.notification.internal.webpush.Subscription;
@@ -54,6 +59,7 @@
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiResponse;
 import io.swagger.annotations.ApiResponses;
+import javafx.util.Pair;
 
 /**
  * This class describes the /habot resource of the REST API.
@@ -79,6 +85,8 @@ public class HABotResource implements RESTResource {
 
     private CardRegistry cardRegistry;
 
+    private ItemNamedAttributesResolver itemNamedAttributesResolver;
+
     @Reference
     public void setVoiceManager(VoiceManager voiceManager) {
         this.voiceManager = voiceManager;
@@ -115,6 +123,15 @@ public void unsetCardRegistry(CardRegistry cardRegistry) {
         this.cardRegistry = null;
     }
 
+    @Reference
+    protected void setItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = itemNamedAttributesResolver;
+    }
+
+    protected void unsetItemNamedAttributesResolver(ItemNamedAttributesResolver itemNamedAttributesResolver) {
+        this.itemNamedAttributesResolver = null;
+    }
+
     public static final String PATH_HABOT = "habot";
 
     @GET
@@ -161,6 +178,27 @@ public Response chat(@HeaderParam(HttpHeaders.ACCEPT_LANGUAGE) @ApiParam(value =
         return Response.ok(reply).build();
     }
 
+    @GET
+    @RolesAllowed({ Role.USER, Role.ADMIN })
+    @Path("/attributes")
+    @Consumes(MediaType.TEXT_PLAIN)
+    @Produces(MediaType.APPLICATION_JSON)
+    @ApiOperation(value = "Gets all item named attributes.")
+    @ApiResponses(value = { @ApiResponse(code = 200, message = "OK", response = ChatReply.class),
+            @ApiResponse(code = 500, message = "An interpretation error occured") })
+    public Response getAttributes(
+            @HeaderParam(HttpHeaders.ACCEPT_LANGUAGE) @ApiParam(value = "language") String language) throws Exception {
+        final Locale locale = (this.localeProvider != null) ? this.localeProvider.getLocale()
+                : LocaleUtil.getLocale(language);
+
+        this.itemNamedAttributesResolver.setLocale(locale);
+        Stream<Pair<String, Set<ItemNamedAttribute>>> attributes = this.itemNamedAttributesResolver
+                .getAllItemNamedAttributes().entrySet().stream()
+                .map(entry -> new Pair<String, Set<ItemNamedAttribute>>(entry.getKey().getName(), entry.getValue()));
+
+        return Response.ok(attributes.collect(Collectors.toMap(Pair::getKey, Pair::getValue))).build();
+    }
+
     @POST
     @Path("/notifications/subscribe")
     // TEXT_PLAIN to work around https://github.com/openhab/openhab-cloud/issues/31
diff --git a/src/main/resources/answers.properties b/src/main/resources/answers.properties
index eb35784..7a04301 100644
--- a/src/main/resources/answers.properties
+++ b/src/main/resources/answers.properties
@@ -12,9 +12,9 @@ answer_nothing_found =  Sorry, but I couldn't find the information. |\
                         I apologize, I'm afraid I have no clue. |\
                         There doesn't seem to be anything matching your query.
 
-standard_hint =         Make sure to tag relevant items with {tags}! |\
-                        I looked for relevant items tagged {tags} but haven't found any. |\
-                        I was expecting to find relevant items with tag {tags} but none matched.
+standard_hint =         Make sure relevant items have attribute(s) {attributes}! |\
+                        I looked for relevant items with {attributes} attribute(s) but haven't found any. |\
+                        I was expecting to find relevant items with {attributes} but none matched.
 
 skill_not_implemented = Sorry, I can't do that currently. |\
                         I'm not yet able to do that. |\
diff --git a/src/main/resources/answers_de.properties b/src/main/resources/answers_de.properties
index 9dee607..e5500d0 100644
--- a/src/main/resources/answers_de.properties
+++ b/src/main/resources/answers_de.properties
@@ -11,9 +11,9 @@ answer_nothing_found =  Tut mir leid, aber ich konnte die Informationen nicht fi
                         Es tut mir leid, ich habe nichts dergleichen. |\
                         Ich entschuldige mich, ich fürchte, ich habe keine Ahnung. |\
                         Es scheint nichts zu geben, was zu deiner Anfrage passt.
-standard_hint =         Achte darauf, relevante Einträge mit {tags} zu versehen! |\
-                        Ich habe nach relevanten Elementen gesucht, die mit {tags} markiert sind, aber keine gefunden. |\
-                        Ich hatte erwartet, relevante Elemente mit dem Tag {tags} zu finden, aber keines passte.
+standard_hint =         Achte darauf, relevante Einträge mit {attributes} zu versehen! |\
+                        Ich habe nach relevanten Elementen gesucht, die {attributes} Kennzeichen haben, aber keine gefunden. |\
+                        Ich hatte erwartet, relevante Elemente mit dem Kennzeichen {attributes} zu finden, aber keines passte.
 
 skill_not_implemented = Tut mir leid, das kann ich im Moment nicht machen. |\
                         Ich bin noch nicht in der Lage, das zu tun. |\
diff --git a/src/main/resources/answers_fr.properties b/src/main/resources/answers_fr.properties
index 732268d..5e00c4c 100644
--- a/src/main/resources/answers_fr.properties
+++ b/src/main/resources/answers_fr.properties
@@ -11,9 +11,9 @@ answer_nothing_found =  D
                         Excusez-moi, je n'en ai aucune idée. |\
                         On dirait qu'il n'y a rien qui corresponde.
 
-standard_hint =         Assurez-vous d'avoir taggé les items correspondants avec {tags}! |\
-                        J'ai cherché des items taggés {tags} mais je n'en ai trouvé aucun. |\
-                        Je m'attendais à trouver des items taggés {tags} mais aucun ne correspondait.
+standard_hint =         Assurez-vous que les items correspondants aient le(s) attribut(s) {attributes}! |\
+                        J'ai cherché des items avec le(s) attribut(s) {attributes} mais je n'en ai trouvé aucun. |\
+                        Je m'attendais à trouver des items avec le(s) attribut(s) {attributes} mais aucun ne correspondait.
 
 skill_not_implemented = Désolé, je ne peux pas faire cela pour le moment. |\
                         Je ne sais pas faire ça pour l'instant. |\
diff --git a/src/main/resources/tagattributes.properties b/src/main/resources/tagattributes.properties
new file mode 100644
index 0000000..91fe803
--- /dev/null
+++ b/src/main/resources/tagattributes.properties
@@ -0,0 +1,74 @@
+# Objects
+battery=Battery,Batteries
+blinds=Blinds,Roller shutters,Rollershutters
+camera=Camera,Cameras
+car=Car,Cars
+cleaningrobot=Cleaning robot,Cleaning robots,Vacuum robot,Vacuum Robots,Roomba,Roombas
+door=Door,Doors
+fan=Fan,Fans
+frontdoor=Front door,Frontdoor
+garagedoor=Garage door,Garage doors
+lightbulb=Bulb,Bulbs,Lightbulb,Lightbulbs,Light,Lights,Lighting
+motiondetector=Motion,Motion sensor,Motion sensors,Motion detector,Motion sensors
+networkappliance=Network,Server,Servers,Gateway,Gateways,Bridge,Bridges,Router,Routers
+poweroutlet=Power,Outlet,Outlets,Power outlet,Power outlets
+projector=Projector,Projectors,Beamer,Beamers
+radiatorcontrol=Radiator,Radiators
+receiver=Receiver,Receivers,Audio Receiver,Audio Receivers,AV Receiver,AV Receivers
+remotecontrol=Remote control,Remote controls
+screen=Screen,Screens,Television,Televisions,TV,TVs
+sensor=Sensor,Sensors
+siren=Siren,Sirens
+smokedetector=Smoke detector,Smoke detectors
+speaker=Speaker,Speakers
+valve=Valve,Valves
+wallswitch=Wall switch,Wall switches
+webservice=Web service,Web Services
+window=Window,Windows
+whitegood=Washing machine,Washing machines,Dishwasher,Dishwashers,Dryer,Dryers,Fridge,Fridges,Oven,Ovens
+
+# Locations
+cellar=Cellar
+livingroom=Livingroom,Living room
+kitchen=Kitchen
+bedroom=Bedroom,Bedrooms
+bath=Bath,Bathroom,Bathrooms
+toilet=Toilet,Toilets,WC,WCs
+closet=Closet,Closets
+dressing=Dressing,Dressings,Dressing room,Dressing rooms
+office=Office,Offices
+groundfloor=Ground floor
+firstfloor=First floor
+attic=Attic
+corridor=Corridor,Corridors
+garage=Garage,Garages
+
+# Properties
+temperature=Temperature,Temperatures
+light=Light,Lights,Lighting
+humidity=Humidity,Moisture
+presence=Presence
+smoke=Smoke
+noise=Noise
+rain=Rain
+wind=Wind
+water=Water
+co2=CO2,carbon dioxyde
+co=CO,carbon monoxyde
+energy=Energy
+power=Power
+voltage=Voltage
+current=Current
+frequency=Frequency
+gas=Gas
+oil=Oil
+
+# Purposes
+alarm=Alarm,Alarms
+firealarm=Fire alarm,Fire alarms
+leakage=Leakage alarm,Leakage alarms
+intrusion=Intrusion alarm,Intrusion alarms
+coalarm=CO alarm,CO alarms,carbon monoxyde alarm,carbon monoxyde alarms
+heating=Heating,Radiator,Radiators,Climate,Thermostat,Thermostats
+cooling=Cooling,Thermostat,Thermostats
+presence=Presence
diff --git a/src/main/resources/tagattributes_de.properties b/src/main/resources/tagattributes_de.properties
new file mode 100644
index 0000000..55ab420
--- /dev/null
+++ b/src/main/resources/tagattributes_de.properties
@@ -0,0 +1,74 @@
+# Objects
+battery=Batterie,Batterien
+blinds=Jalousie,Jalousien,Rollladen,Rollläden
+camera=Kamera,Kameras
+car=Auto,Autos,Wagen
+cleaningrobot=Roboterstaubsauger,Reinigungsroboter,Staubsaugerroboter,Roomba,Roombas
+door=Tür,Türen
+fan=Ventilator,Ventilatoren,Lüfter
+frontdoor=Haustür,Haustüren,Eingangstür,Vordertür,Fronttür,Fronttüren
+garagedoor=Garagentor,Garagentore
+lightbulb=Glühbirne,Glühbirnen,Glühbirne,Glühbirnen,Licht,Lichten,Beleuchtung
+motiondetector=Bewegung,Bewegungssensor,Bewegungssensoren,Bewegungsdetektor,Bewegungssensoren
+networkappliance=Netzwerk,Server,Servers,Gateway,Gateways,Bridge,Bridges,Router
+poweroutlet=Strom,Steckdose,Steckdosen,Steckdose,Steckdosen
+projector=Projektor,Projektoren,Beamer
+radiatorcontrol=Heizkörper,Heizkörperregelung
+receiver=Receiver,AV-Receiver,Audio-Spieler,Empfänger,Audioempfänger
+remotecontrol=Fernbedienung,Fernbedienungen
+screen=Bildschirm,Bildschirme,Fernseher
+sensor=Sensor,Sensoren
+siren=Sirene,Sirenen
+smokedetector=Rauchmelder
+speaker=Lautsprecher
+valve=Ventil,Ventile
+wallswitch=Wandschalter,Wanddimmer,Lichtschalter
+webservice=Web Service,Web Services
+window=Fenster
+whitegood=Waschmaschine,Waschmaschinen,Geschirrspüler,Trockner,Wäschetrockner,Kühlschrank,Kühlschränke,Ofen,Bratofen
+
+# Locations
+cellar=Keller
+livingroom=Wohnzimmer
+kitchen=Küche
+bedroom=Schlafzimmer
+bath=Bad,Badezimmer
+toilet=Toilette,Toiletten,WC,WCs
+closet=Schrank,Schränke
+dressing=Ankleideraum,Ankleidezimmer
+office=Büro,Büros
+groundfloor=Erdgeschoss,EG
+firstfloor=Obergeschoss,OG
+attic=Dachboden
+corridor=Korridor,Korridoren,Wohnungsgang
+garage=Garage,Garagen
+
+# Properties
+temperature=Temperatur,Temperaturen
+light=Licht,Lichter,Beleuchtung
+humidity=Feuchtigkeit
+presence=Anwesenheit,Präsenz
+smoke=Rauch
+noise=Lärm
+rain=Regen
+wind=Wind
+water=Wasser
+co2=CO2,Kohlendioxid
+co=CO,Kohlenmonoxid
+energy=Energie
+power=Leistung,elektrische Leistung
+voltage=Spannung
+current=Strom,Stromstärke
+frequency=Frequenz
+gas=Gas
+oil=Öl
+
+# Purposes
+alarm=Alarm,Alarme
+firealarm=Feueralarm,Feueralarm
+leakage=Leckagealarm,Leckagealarme
+intrusion=Einbruchalarm,Einbruchalarme
+coalarm=CO-Alarm,CO-Alarme,Kohlenmonoxid-Alarm,Kohlenmonoxyd-Alarme,Kohlenmonoxydmelder
+heating=Heizung,Heizkörper,Klimaanlage,Thermostat,Thermostaten
+cooling=Kühlung,Klimaanlage,Thermostat,Thermostaten
+presence=Anwesenheit,Präsenz
diff --git a/src/main/resources/tagattributes_fr.properties b/src/main/resources/tagattributes_fr.properties
new file mode 100644
index 0000000..44ef74d
--- /dev/null
+++ b/src/main/resources/tagattributes_fr.properties
@@ -0,0 +1,74 @@
+# Objects
+battery=batterie,batteries
+blinds=store,stores,volet,volets
+camera=caméra,caméras
+car=voiture,voitures
+cleaningrobot=robot ménager,robots ménagers,robot aspirateur,robots aspirateurs,roomba,roombas
+door=porte,portes
+fan=ventilateur,ventilateurs
+frontdoor=porte d'entrée,portes d'entrée
+garagedoor=porte de garage,porte du garage,portes de garage,portes des garages
+lightbulb=ampoule,ampoules,lumière,lumières,lampe,lampes
+motiondetector=mouvement,détecteur de mouvement,détecteurs de mouvement,détection de mouvement
+networkappliance=réseau,serveur,serveurs,routeur,routeurs
+poweroutlet=prise,prises,prise de courant,prises de courant
+projector=projecteur,projecteurs
+radiatorcontrol=radiateur,radiateurs
+receiver=amplificateur,amplificateurs,récepteur,récepteurs
+remotecontrol=télécommande,télécommandes
+screen=écran,écrans,télé,télés,télévision,télévisions,tv,tvs
+sensor=capteur,capteurs
+siren=sirène,sirènes
+smokedetector=fumée,détecteur de fumée,détecteurs de fumée,détection de fumée
+speaker=enceinte,enceintes
+valve=valve,valves
+wallswitch=interrupteur,interrupteur,interrupteur mural,interrupteur muraux
+webservice=web service,web services
+window=fenêtre,fenêtres
+whitegood=machine à laver,machines à laver,lave vaiselle,lave vaisselles,sèche linge,sèche linges,réfrigérateur,réfrigérateurs,frigo,frigos,four,fours
+
+# Locations
+cellar=cave
+livingroom=salon,séjour
+kitchen=cuisine
+bedroom=chambre,chambre à coucher,chambres,chambres à coucher
+bath=salle de bain,salles de bain
+toilet=toilettes,WC,WCs
+closet=placard,placards
+dressing=dressing,dressings,vestiaire,vestiaires
+office=bureau,bureaux
+groundfloor=rez de chaussée
+firstfloor=premier étage
+attic=grenier
+corridor=couloir,couloirs
+garage=garage,garages
+
+# Properties
+temperature=température,températures
+light=lumière,lumières,lampes,éclairage
+humidity=humidité
+presence=présence
+smoke=fumée
+noise=bruit
+rain=pluie
+wind=vent
+water=eau
+co2=CO2,dioxyde de carbone
+co=CO,monoxyde de carbone
+energy=énergie
+power=puissance,électricité
+voltage=Voltage
+current=courange
+frequency=fréquence
+gas=gaz
+oil=fioul,fuel,pétrole
+
+# Purposes
+alarm=alarme,alarmes
+firealarm=alarme incendie,alarmes incendie
+leakage=alarme fuite,alarmes fuites
+intrusion=alarme intrusion,alarmes intrusion
+coalarm=alarme CO,alarmes CO,alarme monoxyde de carbone,alarmes monoxyde de carbone
+heating=chauffage,radiateur,radiateurs,thermostat,thermostats,air conditionné
+cooling=air conditionné,thermostat,thermostats
+presence=présence
diff --git a/web/src/assets/components.json b/web/src/assets/components.json
index c260b78..74615bd 100644
--- a/web/src/assets/components.json
+++ b/web/src/assets/components.json
@@ -510,12 +510,12 @@
     },
 
     "HbImage": {
-        "description": "Displays an item as an image. Requires a sitemap and a 'habot:image:sitemap:<sitemapname>' tag on the item",
+        "description": "Displays an item as an image. Requires a sitemap and a 'imageSitemap=<sitemapname>' property in the item's 'habot' metadata namespace",
         "availableByDefault": false,
         "configDescriptions": {
             "item": {
                 "type": "item",
-                "description": "The item to display; either an Image item or a String item with an associated sitemap referenced in a 'habot:image:sitemap:<sitemapname> tag"
+                "description": "The item to display; either an Image item or a String item with an associated sitemap referenced in the 'imageSitemap' property of the 'habot' item metadata namespace"
             },
             "aspectRatio": {
                 "type": "optiongroup",
diff --git a/web/src/components/HbImage.vue b/web/src/components/HbImage.vue
index 1ec30da..6a376da 100644
--- a/web/src/components/HbImage.vue
+++ b/web/src/components/HbImage.vue
@@ -46,11 +46,12 @@ export default {
     },
     retrieveImageUrl () {
       if (!this.item) return Promise.resolve(null)
-      if (this.item.tags && this.item.tags.find(t => t.indexOf('habot:image:sitemap:') === 0)) {
-        let sitemapName = this.item.tags.find(t => t.indexOf('habot:image:sitemap:') === 0).split(':')[3]
+      if (this.item.metadata && this.item.metadata.habot &&
+          this.item.metadata.habot.config && this.item.metadata.habot.config.imageSitemap) {
+        let sitemapName = this.item.metadata.habot.config.imageSitemap
         if (!sitemapName) {
-          this.error = 'Cannot retrieve sitemap name from tag'
-          return Promise.reject(new Error('Cannot retrieve sitemap name from tag'))
+          this.error = 'Cannot retrieve sitemap name from metadata'
+          return Promise.reject(new Error('Cannot retrieve sitemap name from metadata'))
         }
 
         return this.$http.get('/rest/sitemaps/' + sitemapName).then((resp) => {
@@ -65,7 +66,7 @@ export default {
           return Promise.reject(new Error('Cannot retrieve sitemap: ' + err))
         })
       } else {
-        return Promise.reject(new Error('Cannot find tag habot:image:sitemap:<sitemapname> on item'))
+        return Promise.reject(new Error('Cannot find imageSitemap metadata config on item'))
       }
     }
   },
diff --git a/web/src/components/HbKnob.vue b/web/src/components/HbKnob.vue
index 2d57321..eaceafc 100644
--- a/web/src/components/HbKnob.vue
+++ b/web/src/components/HbKnob.vue
@@ -26,15 +26,16 @@ export default {
   props: ['model'],
   data () {
     let item = this.$store.getters['items/name'](this.model.config.item)
+    let metadata = (item && item.metadata && item.metadata.habot && item.metadata.habot.config) ? item.metadata.habot.config : null
     /* min/step/values considered in that order:
        1. explicit component config (model.config)
-       2. those items tags: habot:knob:min:<value>, habot:knob:max:<value>, habot:knob:step:<value>
+       2. those metadata config in the item's "habot" metadata namespace: min, max, step
        3. values found in the item's stateDescription
        4. defaults (min=0, max=100, step=1)
     */
     let min
-    if (!min && item && item.tags.find(t => t.indexOf('habot:knob:min:') === 0)) {
-      min = parseFloat(item.tags.find(t => t.indexOf('habot:knob:min:') === 0).split(':')[3])
+    if (!min && item && metadata && metadata.min) {
+      min = metadata.min
     }
     if (!min && item && item.stateDescription && item.stateDescription.minimum) {
       min = item.stateDescription.minimum
@@ -42,8 +43,8 @@ export default {
     if (!min) min = 0
 
     let max
-    if (!max && item && item.tags.find(t => t.indexOf('habot:knob:max:') === 0)) {
-      max = parseFloat(item.tags.find(t => t.indexOf('habot:knob:max:') === 0).split(':')[3])
+    if (!max && item && metadata && metadata.max) {
+      max = metadata.max
     }
     if (!max && item && item.stateDescription && item.stateDescription.maximum) {
       max = item.stateDescription.minimum
@@ -51,8 +52,8 @@ export default {
     if (!max) max = 100
 
     let step
-    if (!step && item && item.tags.find(t => t.indexOf('habot:knob:step:') === 0)) {
-      step = parseFloat(item.tags.find(t => t.indexOf('habot:knob:step:') === 0).split(':')[3])
+    if (!step && item && metadata && metadata.step) {
+      step = metadata.step
     }
     if (!step && item && item.stateDescription && item.stateDescription.step) {
       step = item.stateDescription.step
@@ -62,6 +63,7 @@ export default {
     return {
       wait: false,
       item: item,
+      metadata: metadata,
       defaultMin: min,
       defaultMax: max,
       defaultStep: step,
@@ -98,26 +100,26 @@ export default {
       return this.$expr(this.model.config.label, { state: (this.$refs.knob) ? this.$refs.knob.model : this.itemState })
     },
     iconLeft () {
-      if (!this.model.config.iconLeft && this.item && this.item.tags && this.item.tags.find(t => t.indexOf('habot:knob:iconLeft:') === 0)) {
-        return this.item.tags.find(t => t.indexOf('habot:knob:iconLeft:') === 0).split(':')[3]
+      if (!this.model.config.iconLeft && this.metadata && this.metadata.iconLeft) {
+        return this.$expr(this.metadata.iconLeft)
       }
       return this.$expr(this.model.config.iconLeft)
     },
     iconRight () {
-      if (!this.model.config.iconRight && this.item && this.item.tags && this.item.tags.find(t => t.indexOf('habot:knob:iconRight:') === 0)) {
-        return this.item.tags.find(t => t.indexOf('habot:knob:iconRight:') === 0).split(':')[3]
+      if (!this.model.config.iconRight && this.metadata && this.metadata.iconLeft) {
+        return this.$expr(this.model.config.iconRight)
       }
       return this.$expr(this.model.config.iconRight)
     },
     color () {
-      if (!this.model.config.color && this.item && this.item.tags && this.item.tags.find(t => t.indexOf('habot:knob:color:') === 0)) {
-        return this.item.tags.find(t => t.indexOf('habot:knob:color:') === 0).split(':')[3]
+      if (!this.model.config.color && this.metadata && this.metadata.color) {
+        return this.$expr(this.metadata.color)
       }
       return this.$expr(this.model.config.color)
     },
     trackColor () {
-      if (!this.model.config.trackColor && this.item && this.item.tags && this.item.tags.find(t => t.indexOf('habot:knob:trackColor:') === 0)) {
-        return this.item.tags.find(t => t.indexOf('habot:knob:trackColor:') === 0).split(':')[3]
+      if (!this.model.config.trackColor && this.metadata && this.metadata.trackColor) {
+        return this.metadata.trackColor
       }
       return this.$expr(this.model.config.trackColor)
     }
diff --git a/web/src/components/HbListItem.vue b/web/src/components/HbListItem.vue
index 537f1b8..2be416c 100644
--- a/web/src/components/HbListItem.vue
+++ b/web/src/components/HbListItem.vue
@@ -9,7 +9,7 @@
   </q-item-main>
   <q-item-side right>
     <hb-color-picker :model="{ config: { item: item.name } }" v-if="item && (item.type === 'Color')"></hb-color-picker>
-    <hb-switch :model="{ config: { item: item.name } }" v-if="item && (item.type === 'Switch' || (item.type === 'Dimmer' && item.tags.indexOf('habot:switchable') >= 0) || item.type === 'Color')"></hb-switch>
+    <hb-switch :model="{ config: { item: item.name } }" v-if="item && (item.type === 'Switch' || (item.type === 'Dimmer' && item.tags.indexOf('capability:Switchable') >= 0) || item.type === 'Color')"></hb-switch>
     <hb-shutter-control v-else-if="item && item.type === 'Rollershutter'" class="text-black" style="margin-top: -2px; margin-bottom: -2px"
         :model="{ config: { item: item.name, rounded: true, dense: true, push: true, size: 'lg', stopIcon: 'close', glossy: true } }"></hb-shutter-control>
     <big v-else class="big-value">{{state}}</big>
diff --git a/web/src/components/HbSlider.vue b/web/src/components/HbSlider.vue
index f50be38..c3c0a85 100644
--- a/web/src/components/HbSlider.vue
+++ b/web/src/components/HbSlider.vue
@@ -12,15 +12,16 @@ export default {
   props: ['model'],
   data () {
     let item = this.$store.getters['items/name'](this.model.config.item)
+    let metadata = (item && item.metadata && item.metadata.habot && item.metadata.habot.config) ? item.metadata.habot.config : null
     /* min/step/values considered in that order:
        1. explicit component config (model.config)
-       2. those items tags: habot:slider:min:<value>, habot:slider:max:<value>, habot:slider:step:<value>
+       2. those metadata config in the item's "habot" metadata namespace: min, max, step
        3. values found in the item's stateDescription
        4. defaults (min=0, max=100, step=1)
     */
     let min
-    if (!min && item && item.tags.find(t => t.indexOf('habot:slider:min:') === 0)) {
-      min = parseFloat(item.tags.find(t => t.indexOf('habot:slider:min:') === 0).split(':')[3])
+    if (!min && item && metadata && metadata.min) {
+      min = metadata.min
     }
     if (!min && item && item.stateDescription && item.stateDescription.minimum) {
       min = item.stateDescription.minimum
@@ -28,8 +29,8 @@ export default {
     if (!min) min = 0
 
     let max
-    if (!max && item && item.tags.find(t => t.indexOf('habot:slider:max:') === 0)) {
-      max = parseFloat(item.tags.find(t => t.indexOf('habot:slider:max:') === 0).split(':')[3])
+    if (!max && item && metadata && metadata.max) {
+      max = metadata.max
     }
     if (!max && item && item.stateDescription && item.stateDescription.maximum) {
       max = item.stateDescription.minimum
@@ -37,8 +38,8 @@ export default {
     if (!max) max = 100
 
     let step
-    if (!step && item && item.tags.find(t => t.indexOf('habot:slider:step:') === 0)) {
-      step = parseFloat(item.tags.find(t => t.indexOf('habot:slider:step:') === 0).split(':')[3])
+    if (!step && item && metadata && metadata.step) {
+      step = metadata.step
     }
     if (!step && item && item.stateDescription && item.stateDescription.step) {
       step = item.stateDescription.step
@@ -47,6 +48,7 @@ export default {
 
     return {
       item: item,
+      metadata: metadata,
       defaultMin: min,
       defaultMax: max,
       defaultStep: step,
@@ -88,8 +90,8 @@ export default {
   },
   asyncComputed: {
     color () {
-      if (!this.model.config.color && this.item && this.item.tags && this.item.tags.find(t => t.indexOf('habot:slider:color:') === 0)) {
-        return this.item.tags.find(t => t.indexOf('habot:slider:color:') === 0).split(':')[3]
+      if (!this.model.config.color && this.metadata && this.metadata.color) {
+        return this.$expr(this.metadata.color)
       }
       return this.$expr(this.model.config.color)
     },
diff --git a/web/src/components/HbSwitch.vue b/web/src/components/HbSwitch.vue
index 83409a8..15d63d3 100644
--- a/web/src/components/HbSwitch.vue
+++ b/web/src/components/HbSwitch.vue
@@ -16,7 +16,7 @@ export default {
   },
   methods: {
     onChange (val) {
-      this.$store.dispatch('items/sendCmd', { itemName: this.model.config.item, command: val })
+      this.$store.dispatch('items/sendCmd', { itemName: this.model.config.item, command: val, updateState: true })
     }
   },
   computed: {
@@ -26,7 +26,7 @@ export default {
     itemState: {
       get () {
         if (!this.model.config.item) return 'OFF'
-        let state = this.$store.getters['items/itemState'](this.model.config.item)
+        let state = this.$store.getters['items/itemState'](this.model.config.item, true) // use the raw value
         if (state === 'ON' || state === 'OFF') return state
         if (this.item.type === 'Dimmer' || (this.item.type === 'Color' && state.split(',').length === 1)) {
           return (parseFloat(state) > 0) ? 'ON' : 'OFF'
diff --git a/web/src/components/charts/LineChart.vue b/web/src/components/charts/LineChart.vue
index 69b1f2a..7a0c39c 100644
--- a/web/src/components/charts/LineChart.vue
+++ b/web/src/components/charts/LineChart.vue
@@ -193,7 +193,7 @@ export default {
           },
           axisLabel: {
             inside: false,
-            formatter: '{value} °C\n'
+            formatter: '{value}\n'
           }
           // z: 10
         },
diff --git a/web/src/components/rules/HbCreateRuleCard.vue b/web/src/components/rules/HbCreateRuleCard.vue
index 6ff3983..187c7e9 100644
--- a/web/src/components/rules/HbCreateRuleCard.vue
+++ b/web/src/components/rules/HbCreateRuleCard.vue
@@ -89,7 +89,7 @@
         <q-input v-model="actionNotifyMessage" />
       </q-field>
       <q-field v-if="actionNotify.indexOf('webpush') >= 0" icon="label_outline" label="Tags" orientation="vertical"
-        helper="Optional. The first card matching these tags will be shown when clicking the notification.">
+        helper="Optional. The first card matching these tags will be shown when opening the notification.">
         <q-select
           multiple chips secondary
           color="secondary"
@@ -161,13 +161,11 @@ export default {
           stamp: item.type
         }
       }),
-      tags: this.$store.getters['cards/objectSet']
-        .concat(this.$store.getters['cards/locationSet'])
+      tags: this.$store.getters['cards/tagSet']
         .map((t) => {
           return {
             value: t,
-            label: t.split(':')[1],
-            stamp: t.split(':')[0]
+            label: t
           }
         })
     }
diff --git a/web/src/layouts/designer/CardDesigner.vue b/web/src/layouts/designer/CardDesigner.vue
index d4b7a75..6152668 100644
--- a/web/src/layouts/designer/CardDesigner.vue
+++ b/web/src/layouts/designer/CardDesigner.vue
@@ -102,18 +102,31 @@
                       helper="The subtitle of the card">
                 <config-text v-model="selectedNode.component.subtitle"></config-text>
               </q-field>
+              <q-field label="attributes" class="config-field" orientation="vertical"
+                      helper="The attributes of the card (objects & locations); used for filtering the Card deck and to override the default generated card during the chat">
+                <q-search class="q-body-1 search-tags" color="secondary" v-model="searchAttribute"
+                      placeholder="Search from items">
+                    <q-autocomplete :static-data="attributesSuggestions" @selected="addAttribute" />
+                </q-search>
+                <q-chips-input v-model="selectedNode.component.objects" color="secondary"
+                      :error="!hasAtLeastOneAttribute" placeholder="Objects">
+                </q-chips-input>
+                <q-chips-input v-model="selectedNode.component.locations" color="secondary"
+                      :error="!hasAtLeastOneAttribute" placeholder="Locations" style="margin-top: 0.5rem">
+                </q-chips-input>
+              </q-field>
               <q-field label="suggestcriteria" class="config-field" orientation="vertical"
                       helper="The expression to evaluate in order to determine whether the card will be considered as a suggestion. Leave blank if the card is not to be suggested. Example: items.Temperature.state < 16">
                 <config-expr v-model="selectedNode.config.suggestcriteria" target-type="boolean" color="secondary"></config-expr>
               </q-field>
               <q-field label="tags" class="config-field" orientation="vertical"
-                      helper="The tags attached to the card - use object:<tag> and location:<tag> to make HABot present this card instead of the default generated one when asked about those tags (unless notReuseableInChat below is set). At least one object tag or one location tag is required.">
-                <q-search class="q-body-1 search-tags" color="secondary" v-model="searchTag"
+                      helper="The tags attached to the card">
+                <!-- <q-search class="q-body-1 search-tags" color="secondary" v-model="searchTag"
                       :error="!hasValidTags"  placeholder="Search from items">
                     <q-autocomplete :static-data="tagSuggestions" @selected="addTag" />
-                </q-search>
+                </q-search> -->
                 <q-chips-input v-model="selectedNode.component.tags" color="secondary"
-                      :error="!hasValidTags" placeholder="Type more">
+                      placeholder="Add tags">
                 </q-chips-input>
               </q-field>
               <q-field label="notReuseableInChat" class="config-field" orientation="vertical"
@@ -336,10 +349,18 @@ export default {
       treeModel: null,
       selectedNodeId: 'card',
       newCard: false,
-      searchTag: null,
+      searchAttribute: null,
       showJsonEditor: false,
-      tagSuggestions: {
-        field: 'label',
+      attributesSuggestions: {
+        field: 'value',
+        list: []
+      },
+      objectSuggestions: {
+        field: 'value',
+        list: []
+      },
+      locationSuggestions: {
+        field: 'value',
         list: []
       }
     }
@@ -350,8 +371,8 @@ export default {
       this.$router.back()
     },
     save () {
-      if (!this.hasValidTags) {
-        this.$q.dialog({ title: 'Tags missing', message: 'The card must have at least one object or one location tag' })
+      if (!this.hasAtLeastOneAttribute) {
+        this.$q.dialog({ title: 'Object and/or location required', message: 'The card must have at least one object or one location attribute' })
         return
       }
       this.card.uid = this.uid
@@ -449,6 +470,14 @@ export default {
       this.searchTag = null
       this.card.tags.push(tag.value)
     },
+    addAttribute (attribute) {
+      this.searchAttribute = null
+      if (attribute.type === 'location') {
+        this.card.locations.push(attribute.value)
+      } else {
+        this.card.objects.push(attribute.value)
+      }
+    },
     copyCutComponent (type) {
       if (!this.selectedNode) return
       if (this.selectedNode.type === 'slot') {
@@ -536,9 +565,8 @@ export default {
       if (!this.selectedNode) return null
       return this.components[this.selectedNode.component.component]
     },
-    hasValidTags () {
-      if (!this.card.tags) return false
-      return this.card.tags.some(tag => tag.startsWith('object:') || tag.startsWith('location:'))
+    hasAtLeastOneAttribute () {
+      return this.card.objects.length > 0 || this.card.locations.length > 0
     },
     jsonEditorModel () {
       // if (this.selectedNode.label === 'HbCard') return this.selectedNode.component
@@ -550,16 +578,6 @@ export default {
     let vm = this
     let card = vm.$store.getters['cards/copy'](this.uid)
 
-    vm.tagSuggestions.list = vm.$store.getters['items/objectSet']
-      .concat(vm.$store.getters['items/locationSet'])
-      .map((t) => {
-        return {
-          value: t,
-          label: t.split(':')[1],
-          stamp: t.split(':')[0]
-        }
-      })
-
     if (card) {
       vm.card = card
       if (!vm.card.tags) vm.card.tags = [] // temp
@@ -570,7 +588,9 @@ export default {
         title: 'New Card',
         subtitle: 'Subtitle',
         component: 'HbCard',
-        tags: (vm.$route.query.tags) ? vm.$route.query.tags.split(',') : [],
+        objects: (vm.$route.query.objects) ? vm.$route.query.objects.split(',') : [],
+        locations: (vm.$route.query.locations) ? vm.$route.query.locations.split(',') : [],
+        tags: [],
         bookmarked: false,
         config: {},
         slots: {}
@@ -654,6 +674,27 @@ export default {
     document.addEventListener('copy', this.copyCutEvent)
     document.addEventListener('paste', this.pasteEvent)
   },
+  mounted () {
+    const vm = this
+    // Populate the attribute suggestions
+    this.$http.get('/rest/habot/attributes').then((resp) => {
+      for (let item of Object.values(resp.data)) {
+        for (let attr of item) {
+          let suggestion = {
+            type: attr.type,
+            label: attr.value,
+            value: attr.value,
+            icon: attr.type === 'location' ? 'mdi-map-marker-outline' : 'mdi-cube-outline'
+          }
+          if (!vm.attributesSuggestions.list.some((a) => a.value === suggestion.value)) {
+            vm.attributesSuggestions.list.push(suggestion)
+          }
+        }
+      }
+    }).catch((err) => {
+      this.$q.notify('Cannot get the attribute suggestions: ' + err)
+    })
+  },
   destroyed () {
     // document.removeEventListener('keyup', this.keyPressed)
     document.removeEventListener('cut', this.copyCutEvent)
diff --git a/web/src/layouts/help/GettingStarted.vue b/web/src/layouts/help/GettingStarted.vue
index fedcf52..7dd80c4 100644
--- a/web/src/layouts/help/GettingStarted.vue
+++ b/web/src/layouts/help/GettingStarted.vue
@@ -158,9 +158,10 @@
     <div class="q-display-1 text-center full-width"><q-icon class="q-display-3 full-width" name="mdi-thought-bubble" /><br />To be helpful, I need you to prepare your items first so I can figure out how they are related to your queries</div>
     <div class="q-headline text-center full-width">In the next tutorial, I'll tell you all about it!</div>
     <div class="full-width flex flex-center">
-      <q-btn push size="xl" color="secondary" @click="$emit('go', 'tagging-items')">Go</q-btn>
+      <q-btn push disabled size="xl" color="secondary" @click="$emit('go', 'tagging-items')">Go</q-btn>
       <q-btn flat size="md" color="secondary" @click="$emit('done')">or Close</q-btn>
     </div>
+    <q-alert type="warning" message="The next tutorial is under (re)construction - sorry!" /><br /><br />
   </q-carousel-slide>
 
   <q-carousel-control
diff --git a/web/src/layouts/itemtable/ItemTable.vue b/web/src/layouts/itemtable/ItemTable.vue
index 783463c..8afe768 100644
--- a/web/src/layouts/itemtable/ItemTable.vue
+++ b/web/src/layouts/itemtable/ItemTable.vue
@@ -9,7 +9,7 @@
         icon="arrow_back"
       />
       <q-toolbar-title>
-        Item tags review
+        Item attributes review
       </q-toolbar-title>
     </q-toolbar>
 
@@ -41,14 +41,13 @@
           @click="props.toggleFullscreen"
         />
       </template>
-      <q-td slot="body-cell-tags" slot-scope="props" :props="props">
-        <q-chip small color="secondary" v-for="tag in props.value" :key="tag" class="q-mr-sm">{{ tag }}</q-chip>
-      </q-td>
-      <q-td slot="body-cell-inheritedTags" slot-scope="props" :props="props">
-        <q-chip small color="secondary" style="opacity: 0.7" v-for="tag in props.value" :key="tag" class="q-mr-sm">{{ tag }}</q-chip>
-      </q-td>
-      <q-td slot="body-cell-groups" slot-scope="props" :props="props">
-        <q-chip small color="green" v-for="group in props.value" :key="group" class="q-mr-sm">{{ group }}</q-chip>
+      <q-td slot="body-cell-attributes" slot-scope="props" :props="props">
+        <q-chip small dense :color="attribute.source === 'TAG' ? 'secondary' : 'tertiary'"
+          :style="{ opacity: attribute.inherited ? 0.4 : 1 }"
+          v-for="attribute in props.value"
+          :key="attribute" class="q-mr-sm">
+            <q-icon :name="attribute.type === 'location' ? 'mdi-map-marker-outline' : 'mdi-cube-outline'" /> {{ attribute.value }}
+        </q-chip>
       </q-td>
     </q-table>
   </q-modal-layout>
@@ -71,50 +70,28 @@ export default {
         { name: 'name', field: 'name', label: 'Name', align: 'left', sortable: true, required: true },
         { name: 'type', field: 'type', label: 'Type', align: 'center', sortable: true },
         { name: 'label', field: 'label', label: 'Label', align: 'left', sortable: true },
-        { name: 'groups', field: 'groupNames', label: 'Groups', align: 'left', sortable: true },
-        { name: 'tags', field: 'tags', label: 'Direct Tags', align: 'left', sortable: true, required: true },
-        { name: 'inheritedTags', field: 'inheritedTags', label: 'Inherited Tags', align: 'left', sortable: true, required: true }
+        { name: 'attributes', field: 'attributes', label: 'Attributes', sortable: true }
       ],
       items: [],
       filter: '',
-      visibleColumns: ['name', 'type', 'label', 'groups', 'tags'],
+      visibleColumns: ['name', 'type', 'label', 'attributes'],
       selected: []
     }
   },
   methods: {
-    addInheritedTags (item, taglist, leaf) {
-      if (!leaf) {
-        for (var tag of item.tags) {
-          if (tag.startsWith('object:') || tag.startsWith('location:')) {
-            taglist.push(tag)
-          }
-        }
-      }
-      for (var groupName of item.groupNames) {
-        let group = this.$store.state.items.map[groupName]
-        if (group) {
-          this.addInheritedTags(group, taglist)
-        } else {
-          console.warn(`Cannot find ${item.name} parent group: ${groupName}!`)
-        }
-      }
-    },
     processItems () {
-      let items = extend(true, [], this.$store.state.items.items).map(i => {
-        let ret = {
-          name: i.name,
-          type: i.type,
-          label: i.label,
-          groupNames: i.groupNames,
-          tags: i.tags
-        }
-
-        let inheritedTags = []
-        this.addInheritedTags(i, inheritedTags, true)
-        ret.inheritedTags = inheritedTags
-        return ret
+      this.$http.get('/rest/habot/attributes').then((response) => {
+        let items = extend(true, [], this.$store.state.items.items).map(i => {
+          let ret = {
+            name: i.name,
+            type: i.type,
+            label: i.label,
+            attributes: response.data[i.name]
+          }
+          return ret
+        })
+        this.items = items
       })
-      this.items = items
     }
   },
   created () {
diff --git a/web/src/pages/CardBookmarks.vue b/web/src/pages/CardBookmarks.vue
index 40306f0..3b8fb70 100644
--- a/web/src/pages/CardBookmarks.vue
+++ b/web/src/pages/CardBookmarks.vue
@@ -5,9 +5,8 @@
       </div>
       <div v-if="cards.length === 0" class="fit text-center q-pt-xl q-pl-lg q-pr-lg text-grey">
         <h4 class="q-display-1">No bookmarked cards</h4>
-        <p>Bookmark cards using their context menu in the
+        <p>Bookmark stored cards using their context menu from the deck or while chatting with HABot.</p>
         <q-btn flat icon="dashboard" @click="$router.push('/cards/deck')" style="margin-top: -1px" label="Card deck" />
-        or while chatting with HABot.</p>
       </div>
     </div>
 </template>
diff --git a/web/src/pages/CardDeck.vue b/web/src/pages/CardDeck.vue
index 5406134..090d1c5 100644
--- a/web/src/pages/CardDeck.vue
+++ b/web/src/pages/CardDeck.vue
@@ -19,7 +19,7 @@
         <p>Change the filters or use the button below to create one.</p>
       </div>
       <div v-else-if="nofilters" class="fit text-center q-pt-xl q-pl-lg q-pr-lg text-grey">
-        <h4 class="q-display-1">Select tags to show cards</h4>
+        <h4 class="q-display-1">Select attributes to show cards</h4>
         <p>Use the filters above to display the corresponding cards, or create one.</p>
         <q-btn flat icon="bookmark" @click="$router.push('/cards/bookmarks')" style="margin-top: -1px" label="Bookmarks" />
         <q-btn flat icon="star" @click="$router.push('/cards/suggestions')" style="margin-top: -1px" label="Suggestions" />
@@ -114,13 +114,13 @@ export default {
   },
   methods: {
     addCard () {
-      this.$router.push({ path: '/designer/' + uid(), query: { tags: this.currentFilterTags.join(',') } })
+      this.$router.push({ path: '/designer/' + uid(), query: { objects: this.currentObjects.join(','), locations: this.currentLocations.join(',') } })
     },
     addListCard () {
-      this.$router.push({ path: '/designer/' + uid(), query: { type: 'list', tags: this.currentFilterTags.join(',') } })
+      this.$router.push({ path: '/designer/' + uid(), query: { type: 'list', objects: this.currentObjects.join(','), locations: this.currentLocations.join(',') } })
     },
     addTabbedCard () {
-      this.$router.push({ path: '/designer/' + uid(), query: { type: 'tabs', tags: this.currentFilterTags.join(',') } })
+      this.$router.push({ path: '/designer/' + uid(), query: { type: 'tabs', objects: this.currentObjects.join(','), locations: this.currentLocations.join(',') } })
     }
   },
   watch: {
@@ -141,22 +141,22 @@ export default {
     },
     objectSet: {
       get () {
-        return this.$store.getters['cards/objectSet'].map((tag) => {
+        return this.$store.getters['cards/objectSet'].map((object) => {
           return {
-            value: tag,
-            label: tag.replace('object:', ''),
-            stamp: '(' + this.$store.getters['cards/tag'](tag).length + ')'
+            value: object,
+            label: object,
+            stamp: '(' + this.$store.getters['cards/object'](object).length + ')'
           }
         })
       }
     },
     locationSet: {
       get () {
-        return this.$store.getters['cards/locationSet'].map((tag) => {
+        return this.$store.getters['cards/locationSet'].map((location) => {
           return {
-            value: tag,
-            label: tag.replace('location:', ''),
-            stamp: '(' + this.$store.getters['cards/tag'](tag).length + ')'
+            value: location,
+            label: location.replace('location:', ''),
+            stamp: '(' + this.$store.getters['cards/location'](location).length + ')'
           }
         })
       }
@@ -165,18 +165,14 @@ export default {
       get () {
         let objects = (this.multiple) ? this.objects : (this.objects) ? [this.objects] : []
         let locations = (this.multiple) ? this.locations : (this.locations) ? [this.locations] : []
-        return this.$store.getters['cards/tags'](objects, locations)
+        return this.$store.getters['cards/filter'](objects, locations)
       }
     },
-    currentFilterTags () {
-      let tags = []
-      if (!this.multiple) {
-        if (this.objects) tags.push(this.objects)
-        if (this.locations) tags.push(this.locations)
-      } else {
-        tags = tags.concat(this.objects).concat(this.locations)
-      }
-      return tags
+    currentObjects () {
+      return (this.multiple) ? this.objects : [this.objects]
+    },
+    currentLocations () {
+      return (this.multiple) ? this.locations : [this.locations]
     }
   }
 }
diff --git a/web/src/pages/CardSuggestions.vue b/web/src/pages/CardSuggestions.vue
index 16c4a2e..e51beac 100644
--- a/web/src/pages/CardSuggestions.vue
+++ b/web/src/pages/CardSuggestions.vue
@@ -1,20 +1,19 @@
 <template>
-  <q-pull-to-refresh :handler="computeSuggestions">
+  <!-- <q-pull-to-refresh :handler="computeSuggestions"> -->
     <div class="row">
       <div class="hb-cards">
         <component :is="'HbCard'" :model="card" menu="deck" v-for="card in cards" :key="card.uid"></component>
       </div>
       <div v-if="cards.length === 0" class="fit text-center q-pt-xl q-pl-lg q-pr-lg text-grey">
         <h4 class="q-display-1">No suggestions at this time</h4>
-        <p>Edit cards from the
-        <q-btn flat icon="dashboard" @click="$router.push('/cards/deck')" style="margin-top: -1px" label="Card deck" />
-        and add criteria in the designer to make them appear here when relevant.</p>
+        <p>Edit stored cards and add criteria in the designer to make them appear here when relevant.</p>
+        <q-btn flat icon="dashboard" @click="$router.push('/cards/deck')" style="margin-top: -1px;" label="Card deck" />
       </div>
       <div class="full-width q-ma-lg text-center">
         <q-btn outline color="secondary" @click="computeSuggestions()" icon="refresh">Refresh suggestions</q-btn>
       </div>
     </div>
-  </q-pull-to-refresh>
+  <!-- </q-pull-to-refresh> -->
 </template>
 
 <style lang="stylus">
diff --git a/web/src/pages/Chat.vue b/web/src/pages/Chat.vue
index 1645290..1db28d0 100644
--- a/web/src/pages/Chat.vue
+++ b/web/src/pages/Chat.vue
@@ -247,10 +247,7 @@ export default {
         currentChat.finished = true
         currentChat.card = card
       } else if (notification.data && notification.data.tags) {
-        let objects = notification.data.tags.filter(t => t.indexOf('object:') === 0)
-        let locations = notification.data.tags.filter(t => t.indexOf('location:') === 0)
-        let cardCandidates = this.$store.getters['cards/tags'](objects, locations)
-        let matchingCards = cardCandidates.filter(c => c.tags.every(t => notification.data.tags.indexOf(t) >= 0))
+        let matchingCards = this.$store.getters['cards/tagged'](notification.data.tags)
 
         // if more than one match, tough luck, just take the first one
         if (matchingCards.length > 0) {
@@ -323,7 +320,7 @@ export default {
         }
 
         currentChat.intent = response.data.intent
-      }).catch(function (error) {
+      }).catch((error) => {
         let errormessage = (error.response && error.response.data && error.response.data.error && error.response.data.error.message) ? error.response.data.error.message
           : (error.response && error.response.statusText) ? error.response.statusText : error.message
 
@@ -334,9 +331,12 @@ export default {
           avatar: 'statics/icons/icon-192x192.png',
           bgColor: 'negative',
           textColor: 'white',
-          stamp: date.formatDate(new Date(), 'HH:mm')
+          stamp: date.formatDate(new Date(), 'HH:mm'),
+          finished: true
         })
 
+        this.busy = false
+        this.thinking = false
         if (this.$q.platform.is.mobile) {
           setTimeout(this.$refs.input.blur)
         } else {
@@ -370,9 +370,10 @@ export default {
         this.stickToBottom = true
       }
       if (!this.stickToBottom) return
-      var appEl = document.getElementById('q-app')
-      appEl.scrollTop = appEl.scrollHeight
+      // var appEl = document.getElementById('q-app')
+      // appEl.scrollTop = appEl.scrollHeight
       document.body.scrollTop = document.body.scrollHeight
+      document.documentElement.scrollTop = document.documentElement.scrollHeight
     },
 
     startSpeech () {
diff --git a/web/src/pages/Help.vue b/web/src/pages/Help.vue
index c1541f8..85c460a 100644
--- a/web/src/pages/Help.vue
+++ b/web/src/pages/Help.vue
@@ -10,7 +10,7 @@
     <h5 class="q-body text-grey">Essential information</h5>
     <div class="row">
       <help-topic title="Meet HABot" subtitle="Get to know HABot and discover what it can do" topic="getting-started" @launch="launch" />
-      <help-topic title="Tag your items" subtitle="Learn how to prepare your openHAB items for HABot" topic="tagging-items" @launch="launch" />
+      <!-- <help-topic title="Tag your items" subtitle="Learn how to prepare your openHAB items for HABot" topic="tagging-items" @launch="launch" /> -->
       <help-topic title="Get the full experience" subtitle="Make sure you get all the features of this web app" topic="enhanced-features" @launch="launch" />
     </div>
     <h5 class="q-body text-grey">Work with cards</h5>
@@ -23,14 +23,14 @@
 <script>
 import HelpTopic from 'components/help/HelpTopic.vue'
 import GettingStarted from 'layouts/help/GettingStarted.vue'
-import TaggingItems from 'layouts/help/TaggingItems.vue'
+// import TaggingItems from 'layouts/help/TaggingItems.vue'
 import EnhancedFeatures from 'layouts/help/EnhancedFeatures.vue'
 
 export default {
   components: {
     HelpTopic,
     GettingStarted,
-    TaggingItems,
+    // TaggingItems,
     EnhancedFeatures
   },
   data () {
diff --git a/web/src/pages/Settings.vue b/web/src/pages/Settings.vue
index 227d292..b2b7942 100644
--- a/web/src/pages/Settings.vue
+++ b/web/src/pages/Settings.vue
@@ -46,11 +46,11 @@
         </q-item-main>
       </q-item>
 
-      <q-list-header>Item tagging</q-list-header>
+      <q-list-header>Information used for item matching</q-list-header>
       <q-item @click.native="showItemTagger = true">
         <q-item-main>
-          <q-item-tile label>View item tags</q-item-tile>
-          <q-item-tile sublabel>Review and set the tags used to identify items in conversations.</q-item-tile>
+          <q-item-tile label>View item attributes</q-item-tile>
+          <q-item-tile sublabel>Review the named attributes attached to items, used to identify them in conversations.</q-item-tile>
         </q-item-main>
       </q-item>
       <q-modal v-model="showItemTagger" :content-css="{minWidth: '80vw', minHeight: '80vh'}" @show="$refs.itemtable.processItems()">
diff --git a/web/src/store/cards/getters.js b/web/src/store/cards/getters.js
index 4189095..5291dbb 100644
--- a/web/src/store/cards/getters.js
+++ b/web/src/store/cards/getters.js
@@ -4,42 +4,53 @@ const unique = a => [...new Set(a)]
 
 export const objectSet = (state) => {
   if (!state.cards.length) return []
-  const tags = state.cards.map((card) => {
-    return card.tags || []
-  }).reduce((acc, tags) => {
-    return acc.concat(tags)
-  }).filter((tag) => {
-    return tag.indexOf('object:') === 0
+  const objects = state.cards.map((card) => {
+    return card.objects || []
+  }).reduce((acc, objects) => {
+    return acc.concat(objects)
   })
-  return unique(tags)
+  return unique(objects)
 }
 
 export const locationSet = (state) => {
+  if (!state.cards.length) return []
+  const locations = state.cards.map((card) => {
+    return card.locations || []
+  }).reduce((acc, locations) => {
+    return acc.concat(locations)
+  })
+  return unique(locations)
+}
+
+export const tagSet = (state) => {
   if (!state.cards.length) return []
   const tags = state.cards.map((card) => {
     return card.tags || []
   }).reduce((acc, tags) => {
     return acc.concat(tags)
-  }).filter((tag) => {
-    return tag.indexOf('location:') === 0
   })
   return unique(tags)
 }
 
-export const tag = (state) => (tag) => {
+export const object = (state) => (object) => {
+  if (!state.cards.length) return []
+  return state.cards.filter((card) => card.objects.indexOf(object) >= 0)
+}
+
+export const location = (state) => (location) => {
   if (!state.cards.length) return []
-  return state.cards.filter((card) => card.tags && card.tags.indexOf(tag) >= 0)
+  return state.cards.filter((card) => card.objects.indexOf(location) >= 0)
 }
 
-export const tags = (state) => (objects, locations) => {
+export const filter = (state) => (objects, locations) => {
   if (!objects.length && !locations.length) return []
   if (!state.cards.length) return []
   let filtered = state.cards.slice()
   if (objects.length) {
-    filtered = filtered.filter((card) => card.tags && objects.some((t) => card.tags.indexOf(t) >= 0))
+    filtered = filtered.filter((card) => objects.some((t) => card.objects.indexOf(t) >= 0))
   }
   if (locations.length) {
-    filtered = filtered.filter((card) => card.tags && locations.some((t) => card.tags.indexOf(t) >= 0))
+    filtered = filtered.filter((card) => locations.some((t) => card.locations.indexOf(t) >= 0))
   }
   return filtered
 }
@@ -48,6 +59,12 @@ export const all = (state) => {
   return state.cards
 }
 
+export const tagged = (state) => (tags) => {
+  return state.cards.filter((c) => {
+    return c.tags && tags.every((t) => c.tags.indexOf(t) >= 0)
+  })
+}
+
 export const bookmarked = (state) => {
   if (!state.cards) return []
   return state.cards.filter(card => card.bookmarked)
diff --git a/web/src/store/cards/mutations.js b/web/src/store/cards/mutations.js
index 74b1550..dcfc398 100644
--- a/web/src/store/cards/mutations.js
+++ b/web/src/store/cards/mutations.js
@@ -2,7 +2,19 @@ import { extend } from 'quasar'
 
 export const updateAll = (state, cards) => {
   console.log('Loaded ' + cards.length + ' cards')
-  state.cards = cards
+
+  // for backward compatibility - convert old object: and location: tags
+  // to attributes on the cards
+  state.cards = cards.map((c) => {
+    if (!c.objects) c.objects = []
+    if (!c.locations) c.locations = []
+    c.tags.forEach((t) => {
+      if (t.indexOf('object:') === 0 && c.objects.indexOf(t.replace('object:', '')) < 0) c.objects.push(t.replace('object:', ''))
+      if (t.indexOf('location:') === 0 && c.locations.indexOf(t.replace('object:', '')) < 0) c.locations.push(t.replace('location:', ''))
+    })
+
+    return c
+  })
 }
 
 export const createCard = (state, card) => {
diff --git a/web/src/store/items/actions.js b/web/src/store/items/actions.js
index edf42f7..0facd5d 100644
--- a/web/src/store/items/actions.js
+++ b/web/src/store/items/actions.js
@@ -17,7 +17,7 @@ export const initialLoad = (context) => {
   console.log('Fetching initial state of all items...')
 
   return new Promise((resolve, reject) => {
-    axios.get('/rest/items').then((resp) => {
+    axios.get('/rest/items?metadata=habot').then((resp) => {
       context.commit('updateAll', resp.data)
       context.commit('setReady')
       resolve()
diff --git a/web/src/store/items/getters.js b/web/src/store/items/getters.js
index 58ebd53..7808c2b 100644
--- a/web/src/store/items/getters.js
+++ b/web/src/store/items/getters.js
@@ -38,11 +38,19 @@ export const itemState = (state) => (name, raw) => {
   if (!state.items.length) return null
   let item = state.items.find(item => item.name === name)
   if (item && item.state) {
-    if (raw) return item.state
+    let rawState = item.state
+    let unit
+    // handle Number items with dimension (unit suffixed to state)
+    if (item.type.indexOf('Number:') === 0 && item.state.indexOf(' ') > 0) {
+      rawState = item.state.split(' ')[0]
+      unit = item.state.split(' ')[1]
+    }
+    if (raw) return rawState
     if (item.transformedState) {
       return item.transformedState
     } else if (item.stateDescription && item.stateDescription.pattern) {
-      return sprintf(item.stateDescription.pattern, item.state)
+      let pattern = (unit) ? item.stateDescription.pattern.replace('%unit%', unit) : item.stateDescription.pattern
+      return sprintf(pattern, rawState)
     } else {
       return item.state
     }