better handling of new locations

4 jobs for main in 56 seconds (queued for 4 seconds)