MOBILE-549: Several bugs found in the grades WS fixed