@federico-lox Thanks for the feedback.  I'll work on this next week so it can hit prod the week after.