EDX-431: Fix bug to put rubrics in the right order