Only omit clusters if every contained check should be omitted

Only omit clusters if every contained check should be omitted #2083