Fix Content and Locations are indexed by their id.