WOBS-3272, WOBS-3352, WOBS-3274, WOBS-3225

we have just two types, if there is more types in criteria then let's just ommit filtering by it.