Properly fixed add and delete filter bugs :)