This seems like a good way to handle this. Sorry to mislead! Are you volunteering to fix, or should I get to this at some point?