Begin generalizing parts of query
Add basic ZOO support
Move select into switch to account for non-conforming column names
Removes language field
Adds table headings