Refs #5538 - Added regression test
Add filtering for site entities, faster filtering
Merge branch '5539_18' into 1.8