Minor bufix.
Changed switchId to switch_id.