Improve query builder demo