Heri | #2194: Fixing issue "unable to edit single Subject from list"