add server name matching for rpc call and execute