Find all queries refactored