WIP: Queries: Fix some parsing/serialization issues

• fixes query toString inconsistent output
• change serialization behavior
  ( a:b OR a:c ) -> a:( b OR c )
  a:( b OR c ) -> a:( b OR c )
• rename simpleQuerySetKey to querySetKey
  as it also applies on complex queries.