Cleaned up entity id condition
Merge branch 'feature/xmlsitemap-exclude'
Merge branch 'master' into test