diff --git a/src/components/FiltersModal/filtersModal.js b/src/components/FiltersModal/filtersModal.js
index 89ec4a6..d80981d 100644
--- a/src/components/FiltersModal/filtersModal.js
+++ b/src/components/FiltersModal/filtersModal.js
@@ -55,7 +55,7 @@ function FiltersModal({ allNodes, allBindings, isFiltersOpen, setFiltersOpen, fi
         allNodes.forEach(node => {
             if (node.properties) {
                 Object.entries(node.properties).forEach(([propName, prop]) => {
-                    if (prop.data || prop.show) {
+                    if (prop.data || prop.show || prop.as) {
                         // TODO Always showing node.ids[0] makes no sense. Specific node filtering needs implementation
                         const label = prop.as || `${propName} ${node.label}${node.varID < 0 ? ` ${node.ids[0]}` : ''}`;
                         if (!filterableElements.some(element => element.label === label)) {
diff --git a/src/utils/queryParser.js b/src/utils/queryParser.js
index faa82d3..612fe60 100644
--- a/src/utils/queryParser.js
+++ b/src/utils/queryParser.js
@@ -61,7 +61,7 @@ const applyClassAndInstanceRestrictions = (parsedQuery, node, nodeLabelInGraph,
     });
     if (hasInstanceVariable) {
         const instanceLabel = `${nodeLabelInGraph}___instance`;
-        const classLabel = `${nodeLabelInGraph}___class`;
+        const classLabel = `${nodeLabelInGraph}`;
         if (nodeIsVar && !isSpecialClass) {
             parsedQuery.body += addTriple(nodeLabelInGraph, RDFS_SUBCLASSOF_URI, `<${node.class}>`);
             parsedQuery.body += addTriple(instanceLabel, RDF_TYPE_URI, nodeLabelInGraph);