fix for default end-mode value and fix allowing to re-add modifiers when they were removed