Fixes for empty arguments and persistent SwitchAttr value storage