Use URI if no curie is set
Merge branch 'mbst-9478-sitemap-improvements' into stage