Sitemap fixes

Number of fixes for refactored sitemap generation with transient caching and reduced number of queries.