Update correct_org helper