Add main_locations and use them for queue