Event locations need tidyup on upgrade to 2.2

On upgrading my test site to 2.2 I find the wonderful option of re-using an existing location. However, clicking on the drop down box I get a list of every event I have ever run (about 50 events at about 3 different locations). I guess I can dive into the back end & bully it into shape but some form of tidy up for this on upgrade would be magic.

Also, I'm surprised I see the event name not the first line of the location