[#141] Updated save / delete logic for baselocations