Fix Yelp app bug
Fix map crash when navigating back to screen