bugfix: site needed to be joined into the query
Merge branch 'release/1.4'