QueryBuilder and ViewPort fixed