fix two small SGA bugs

(cherry picked from commit f96cfa778d7afa538d87acd89d93ff4ebc3c8a57)
fix multiple-grade-entry bug due to event propagation

(cherry picked from commit 9d210bbe1cb030408ab907e8a0fb9066702b2b63)