[query] Fix value pair terms not matching in query plans and through IsA traversal