Dcikatic/sol 20 filter changes