Fix feature editing. Fixes feedback.