Revert removal of findQuery overload