Fix "None" in form fields values
Remove manage step