Solved extra comma problem in EntityCustom.js and EntityFormPanelCustom.js