Update sitemap module and fix bugs