improve sitemap generation and generic building