Added econ and match dept/cnum parsing with unicode function format