small fix and refactoring sitemap