"Remove" command for the Cross Hotbar removing abilities from ALL hotbars

I created this macro to set up my PvP abilities on PLD:
https://www.dropbox.com/s/1u07dqkfi3...20951.png?dl=0

Then I create this one to restore my default PvE PLD XHB:
https://www.dropbox.com/s/btzmrwnlfu...20944.png?dl=0

The problem is, when I switch from PvP macro to PvE macro the "remove" command removes the 3 abilities from ALL my corresponding cross hotbars. For example, if I switch then to WAR, I am missing the 3 abilities corresponding to those slot names:
https://www.dropbox.com/s/o9uns4tx7g...21007.png?dl=0

Cross Hotbar 6 is not shared. I found this topic that seems similar but the solution didn't work for this specific case:
http://forum.square-enix.com/ffxiv/t...=1#post2167744

I actually fixed this by moving the "/gearset change 2" to the second line, rather than having it at the bottom. The problem was that when I switched to PLD PvE gearset, the removal of the abilities command was triggered too early (and therefore it removed the 3 abilities from the current set before switching to PLD PvE).