Fix and remove some filters for 2.0 specs