Reload on map change, closes #81, closes #82