CRM-14181 fixes, deleted addDisplayEnums() and code fixes