fix find and query