fix some of the override saving logic (when there is no override value)