fixed condition
cleaned code
Merge branch 'develop' into bugfix/sitemap
Merge branch 'bugfix/sitemap' into develop