fix up a bunch of errors with site selection

Merged Chris Hines requested to merge dev into test

Merge request reports