fix supplying initial values when editing fields