Fixed several things wrt FilterSet