Fill in expression fields when there is a form redraw

Change-Id: Ic6172670f49ea039408924c9d7eea90a2b2af965