Fix Yelp Issues

/