Revert "Added navigation constraint to query"

This reverts commit b98f60453fbaf1bd1d9ffdcac459d234a23078f3.