Fix: correct grouping for full-form edit