NOT FINSIHED: Nonexisting tag zero

In addition to #49, also fixing the naming of search models to use commas and or where appropriate.