more query builder improvements