Fixed bug with field rendering after aplly

Change-Id: I63d2c1154d31760a7896017e6de099e485697b54
Code clean up

Change-Id: I4048e06797a2ee2bbb5732e483d1e7cff8875470