enhance database query builder