Update to 1.2

Updated Query Syntax to use key/value pairs as well as still supporting
the old system. Also improved the implementation of