Groups are now displayed correctly on edit form