working on query builder
query builder updates