Fixes issue #52
LocationService now correctly populates sub-entities of Location