Paul:
It appears that having the condition change applied AND having the 'fill' toggle placed where you moved it, the highlighting appears to be ok. Try the attached script, below.
I used dummy data, with the first three based on your info and the last two I added as extra.
This is how it appears after a trial run:
If that appears to be ok at your end, I'll commit the changes.
(Unless you have any additional tweaks, attach your latest file)
EDIT:
Oh, yes, I am ok on the "tidy up" changes that you mentioned in your last post, as it does help consistency.
(However, I did NOT do any of those in the attached file -- to keep it close to what you originally provided)