Fixed item loading on map change