Stability fixes for forms via xmlformgen

Signed-off-by: Arnab Naha <superarnab@gmail.com>