fixed properly filter query builder