Venue picker refactoring, part 1/2