Terminology parser improved