Improve handling of inserted fields
Improve handling of inserted fields

steve21124/Form,Jamonek/Form,kalsariyac/Form,0x73/Form,KevinJacob/Form,steve21124/Form,kalsariyac/Form,KevinJacob/Form,fhchina/Form,kalsariyac/Form,KevinJacob/Form,fhchina/Form,Jamonek/Form,wangmb/Form,wangmb/Form,steve21124/Form,fhchina/Form,0x73/Form,Jamonek/Form,wangmb/Form