ContentRepository and BaseRepository fix