Improve query builder so that it correctly build  conditions short form: field: value.