Index: src/main/java/org/onehippo/forge/ecmtagging/tagcloud/TagCloudPlugin.java
IDEA additional info:
Subsystem: com.intellij.openapi.diff.impl.patch.CharsetEP
<+>UTF-8
===================================================================
--- src/main/java/org/onehippo/forge/ecmtagging/tagcloud/TagCloudPlugin.java	(revision 485)
+++ src/main/java/org/onehippo/forge/ecmtagging/tagcloud/TagCloudPlugin.java	(revision )
@@ -95,7 +95,13 @@
                 final Session session = tagsNodeModel.getNode().getSession();
                 if (session.itemExists(tagsIndex)) {
                     Node index = session.getNode(tagsIndex);
-                    NodeIterator iterator = index.getNodes();
+                    NodeIterator iterator;
+                    if(index.getPrimaryNodeType().getName().equals("hippofacnav:facetnavigation") && index.hasNode("hippostd:tags")){
+                        iterator = index.getNode("hippostd:tags").getNodes();
+                    }
+                    else {
+                        iterator = index.getNodes();
+                    }
                     TagCollection collection = new TagCollection();
                     for (int i = 0; i < limit && iterator.hasNext(); i++) {
                         Node tag = iterator.nextNode();
@@ -127,7 +133,13 @@
         @Override
         public void onClick(AjaxRequestTarget target, Tag tag) {
             try {
-                JcrNodeModel nodeModel = new JcrNodeModel(tagsNodeModel.getNode().getNode(NodeNameCodec.encode(tag.getName(), true)));
+                JcrNodeModel nodeModel;
+                if(tagsNodeModel.getNode().getPrimaryNodeType().getName().equals("hippofacnav:facetnavigation") && tagsNodeModel.getNode().hasNode("hippostd:tags")){
+                    nodeModel = new JcrNodeModel(tagsNodeModel.getNode().getNode("hippostd:tags").getNode(NodeNameCodec.encode(tag.getName(), true)));
+                }
+                else{
+                    nodeModel = new JcrNodeModel(tagsNodeModel.getNode().getNode(NodeNameCodec.encode(tag.getName(), true)));
+                }
                 TagCloudPlugin.this.setModel(nodeModel);
             } catch (PathNotFoundException e) {
                 log.error("tag not found: " + e.getMessage(), e);