rewrite tokens should not be empty

Also fixes some other customOptionSave notification uses