Filter wizard fixes