diff --git a/src/SQL2Linked/Implementations/ResourceStructuralData.cs b/src/SQL2Linked/Implementations/ResourceStructuralData.cs
index 53b8ab2a5811a691139456563c129d6576e4e421..1844571d515fe6fc3d344e00274c24eb00df13b0 100644
--- a/src/SQL2Linked/Implementations/ResourceStructuralData.cs
+++ b/src/SQL2Linked/Implementations/ResourceStructuralData.cs
@@ -139,7 +139,10 @@ namespace SQL2Linked.Implementations
                 // Reinstate the catalog assignments
                 var cmdString = new SparqlParameterizedString
                 {
-                    CommandText = "SELECT DISTINCT ?o WHERE { <" + resourceGraphName + "> <http://www.w3.org/ns/dcat#catalog> ?o }"
+                    CommandText = @"SELECT DISTINCT ?s WHERE { 
+                       ?s ?p <http://www.w3.org/ns/ldp#BasicContainer> . 
+                      FILTER(contains(str(?s), '" + resourceGraphName + @"/') )
+                    }"
                 };
                 var resultSet = WrapRequest(() => RdfStoreConnector.QueryEndpoint.QueryWithResultSet(cmdString.ToString()));
                 foreach (var result in resultSet)