Cool! It looks so perfect :-)For now I'll probably use Nikolay's solution because I have no custom patches in my local git tree, but I'll definitely save yours for future.Thank you both.
This is what I would do. ... Alasdair