list refactored for cdn, removed datasource