Fixing FilterSet features and surly breaking alot