Thanks for bringing this one up agents, we've raised it on this side as the user experience in this area seems painful.