Deleted some code and made nav queries consistent