Fixed flow for edit/create for R/A/D