refactors to sitemap, closed #2254