fixed special cases editing CR

And remove the new value from the form so it doesn't get handled twice