Cleaning up and adding an idempotent filter