Improve the html semantic of two generic templates (counter-and-navigation and title-and-filters)