Improve Venue selection when adding Performance