Issue 6429: Add current annotation again when resetting the options