SitemapManager: fix fails + refacto