fixed LocationCell and LocationController issues