The previous format of the page provides a better insight into the problem, you haven't explained yet why the categorisation of the different uses of the term is necessarily something bad. The POV/nationalist fights have nothing to do with the format of the article, they'll continue in this format, as well. You have erased half the entries on top of it - the ones from the geographical section.