enhancements to select query builder