removed sitemap streaming and added some 'omitempty's