Improved the adding back of our option default filter when adding/updating an option