entity edit form improve plus better cert validation