* Properly return not found for queries and policies
