Refactoring Expressions in SearchBuilder
Make ExportToolbar work with QB2
replace new broken method with old one that works
Merge branch 'fix2pcCheckImport' into develop