Fix grep call on import data tests #2892
Adapt importer to tag thematic filters and attach filters to thematics #2892
Change filter model to integrate thematic logic #2892
Add questionnaire type to test survey #2892
Update test database to include thematics #2892
Update unit tests to take in account new acronym for filter names including thematic #2892