Added the new version of the FilterWizard