Update all and add fix for ad-hoc option editing