ISPN-374 Adapt to filter class refactoring and minor PR fixes