Oh! That's even better than what I was thinking. And fixes more things. I'm not sure the api supports it, but definitely worth looking into.