add second argument to all execute_switch calls