Ported filter improvements to 1.7.10