fix and simplify sitemap functionality