Thank you for the suggestion @jajati. I will see if I can make that work.
@Chris.Eland Please let me know, since it appears from Jajati's comment that I'm not the only one, if you figure out a better fix.
Thanks kindly!
I'll report back later after I have had a chance to fiddle with the suggestion from Jajati.