car queries refactoring