Replace find() with query()