#1119Fixed logic of retrieving sitemap;
Fixed broken tests