Fix up grid feature editing for #7