Fix add/edit product group per the specs