We're working on a way to improve this issue! It'll take a bit of time, since the system is VERY complex, but rest assured it's on the top of our priorities!