TANAL-52 fix more missing tags from emit-form