Cleaning up missing references and switching the HTML escaping for the item UIDs to convert &amp; to &amp;amp;