Better handling of sitemap URLs