Dcikatic/sol 20 filter changes

@martynjames this is a branch implementing SOL-20 fixes. It is pushed to solutions because I don't have permissions to push it to platform.