refactoring urn query to be broader