@cuddly-architect-27013 - I can take that fix if you haven't already started - have a few hours here free.