#2017 - Making filter match the function being used more closely