I was confused at first about the suitcase switch. I guess he just swapped the contents and got lucky that he could move the tracker too?

And "the bad guys are profit-seeking companies" is getting really tiresome. They won't dare make the bad guys terrorists from anywhere realistic anymore so we get stuck with unconvincing villains.