Thanks for testing. I've attached a patch fixing this.

I had deleted a query I thought was now covered :). I look forward to the day we have highlight tests!

Tested. Can confirm this looks correct now!

--
Jostein