added filter and addColumns to query builder