Fix group ordering not updating