* updated query builder version