Separated query building into its own class.  Added basic AND, OR and NOT operators.
Made search handle cases where fields are named "or" "and" or "not"