Fixes various issues with link group expansion