Few more reverts to fix Fill Field Bug