#32681 - filter changes implemented