🇺🇸United States @CheckeredFlag

fernando, I had a similar but related error that your patch fixed...almost.

Adding one more test to your list fixed it in the included patch.

My apologies, but I'm just getting my feet wet with Drupal module development and this is my first attempt at a patch. Therefore, I'm not surprised that it has issues so can you consider this a feature request with the patch being a proof-of-concept?

And sorry for the lengthy delay in responding.