nearby_venues refactor (before merge)