Medias list & grid datasource refactoring