Sarina/fix grades management commands

@carsongee could you please take a look at this?