Further improvements to sitemap