Improved re-adding of default filters on add/update of options