Fix group table problems order