Sitemap regeneration and markup fixes