Migrated to using blocks for querying, ensured that the current node is not returned on selection queries