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