Update 2.2 filter changes in 2.3