Subject cleanup + handle single terms #36

Closed gingerwizard closed 2 years ago