updated parser to handle HO terms better