bugs fixed and new field esId created