I'd make sure that it's only someone who uses the treat/swap to entice the dog out, it's me mainly who does it although my kids (7 and 6) also know how to do this but as it's them who winds Odie up in the first place, I keep them away from him until he is calmer
I've learnt the hard way that if you try and take it off him, he'll react so it's important not to do this. It's a ongoing thing and there is lots of info on here to help you deal with similar situations.
I also use the whistle to call him from wherever he is (ie. under a bush etc). Have you tried this? If not, there is a sticky on here which guides you step by step through it. Very useful for outside recall training too