fix Data Race leading to panic in Scheduler (and use more efficient strings comparison)

fix Data Race leading to panic in Scheduler (and use more efficient strings comparison) #3330