fix up a bunch of errors with site selection

2 jobs for dev in 2 minutes and 59 seconds (queued for 2 seconds)