Thank you, it works very well (it's a bit like what I was proposing), but I find it cleaner and I'll adopt it, thank you. With this solution I'll be able to get around the problem with group captures when TrackRevisions is true.

Have a nice day!