Add condition on states filtering