Support for section choice when doing edit()