Change MapModel to LocationModel and PointOfInterrest to Location
Bug fix on app list