refactored individual car query