Revert "Another refactor of the setFilter method to stop it firing un needed "add" events"

This reverts commit 459701b876fe44661097b27246c25f97a8337e78.