Some fixes for filters and NoFeatureModels