refs #1337: make sure we restrict search by site
refs #1337: make sure we restrict search by site - tweak
Merge branch 'dev' into test