Updated queries for map 4 (Vehicles)
Updated SQL for maps 6 and 7