Fix type filters