Tweak to better handle unIDs term sources