Ported filter changes to 1.7.10