Performance fixies in import
Improved terminology parser
terminology parser improved