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