Better fix: add filter to option defaults