diff --git a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
index 48e65ad..f4c7ceb 100644
--- a/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
+++ b/bundles/org.eclipse.wst.xml.core/src/org/eclipse/wst/xml/core/internal/modelquery/XMLModelQueryAssociationProvider.java
@@ -32,7 +32,14 @@
 	}
 
 	protected String resolveGrammarURI(Document document, String publicId, String systemId) {
-		
+
+        /*
+         * Fix for bug 110356
+         * https://bugs.eclipse.org/bugs/show_bug.cgi?id=110356
+         * 
+         * TODO: XMLCatalogURIResolverExtension was contributed to "postnormalization" 
+         * stage, but not to "physical" stage.  We have to reconcile that.
+         */		
 		String resolvedId = idResolver.resolve(null, publicId, systemId); // initially we had only this call
 		if(resolvedId == null){
 			String location = systemId;