Fix filter wizard #2271

- Bug fixes to fix filter wizard