Added getLocations and getTags