P.S. Have you thought of using the event name instead of the venue name in the first line of your locations? I did that on my test site, and then add the Venue in either the second line of address or in the description section ? Just a thought.
Example attached screen shot, I added event name First Line under Location, added the Venue in second address, and added in Description…just for example.