Fix check on subcase match value
Fix clean subcase match value method