rework query_builder to use golang json marshaller, fixes bugs relating to quoting (e.g. attribute value with double-quote character - work done by Mark Boyd