null form issues fixed