Added more fixes to GroupId URLs