standardized the search interface
moved a few more parsing issues to the subtype module