Lets outside query file screen for duplicate evaluations
Updates site object to match new(?) structure
Merge branch 'develop'