Merge pull request #1695 from jjettenn/feature/simplified_filter_UX_2649

Feature/simplified filter ux 2649
fix unit test
Merge pull request #1697 from bartcharbon/master

fix unit test
Merge branch 'master' of github.com:molgenis/molgenis into feature/simplified_filter_UX_2649