car queries more refactoring