Refactoring codes

Change news source Dynamic attribute "group" -> counter