Add group expansion sort
Make connectors use internal group/serie names