fix router & add Gid field to Group