Merge pull request #1159 from dennishendriksen/feature/genericdataexplorer

Fix filter wizard #2271
Merge branch 'feature/genericdataexplorer' of https://github.com/molgenis/molgenis into feature/genericdataexplorer