refactors site map
Merge pull request #1701 from velesin/sitemap_refactoring

refactors site map