v0.6.20 Fixed rest form generation