UMLS handling improvements