I suggest having a different set of macros for search/pounce and for running CQ.  The sequence is different.

I also have separate macros ready for repeating section, class and "all again pse."  I use those a lot in the Field Day chaos.

Another country heard from,

73 Eric KG6MZS