Fixed YelpBase Bundle/Hashmap