Let's try this again....

Had to rollback - issues with the Sitemap packages and the database
(don't ask me) - This should actually work better.