rebuilding query builder schema so it knows about table value structures for client side where behavior
merge conflict fixed