[avswitch] some changes