OAK 1977: Actually using path during query (mistake on my part). Also adding test to assert path awareness during query