use string matching loop for query types; add pretty printer
Merge branch 'master' of git://github.com/stupidsing/suite