NTB: Improve index handling in B2B MW workaround