A/HRC/20/26/Add.1 designated territories. It is important to note that a strict application of the criteria of territoriality, notably with respect to rights in the field of education, could undermine efforts to safeguard the languages and identities of minorities, especially considering that nowadays, for a number of reasons, members of minorities may opt to settle in regions other than those they traditionally inhabit. Following previous recommendations by regional and international human rights bodies, the Independent Expert urges the Government to be more flexible in its approach, to consider extending support to linguistic and ethnic groups other than those officially recognized in Austria and to improve the existing mechanisms for the disbursement of funds for activities of national minorities. 97. The Independent Expert is concerned about the data-collection system used for the 2011 census, which excluded information on national, linguistic and religious affiliation, contrary to previous censuses. The Independent Expert encourages the Government to adopt a non-mandatory and anonymous information-gathering system with a view to enabling/creating a database on cultural diversity in Austria, including data on linguistic and religious diversity as well as internal and international migration. Such a system should guarantee privacy and be respectful of the principle of self-identification of all persons regarding their national, linguistic and religious affiliations. Where necessary, the Government should initiate dialogues with communities to strengthen trust and understanding of the purpose of such a survey. To that end, the Independent Expert also recommends that the Government consult with, in particular, civil society organizations and the communities concerned with regard to the specific formulation of questions to be asked during the census. 98. The Independent Expert is concerned that the schooling system, which divides education after kindergarten and after primary school into separate parallel streams has an indirect discriminatory effect on children according to their background. Negatively impacting children with disabilities and a migrant background, the system impedes opportunities for cross-cultural interaction which are essential for intercultural understanding and building pluralistic societies. The Independent Expert welcomes the creation of new middle schools and recommends the adoption of an integrated system for all compulsory education in public schools. 99. The Government should take all necessary measures to ensure full respect for human rights and cultural diversity by all public officials and security forces, including by expanding its initiatives to include training on human rights and cultural diversity in the mandatory curricula of public officials across the country. 100. Measures are needed to encourage public and private media to avoid stigmatizing certain communities. Intercultural exchanges among diverse groups would help to overcome ghettoization according to attributes such as language, religion, ethnic background and any kind of disability. 101. The Independent Expert welcomes the existing initiatives to promote interfaith dialogue. However, more than religious authorities engaging with each other, the need is to provide also opportunities for communities to share experiences and engage with each other. 102. The Austrian Constitution is in the process of being reformed. The Independent Expert encourages the Austrian Constitutional Assembly to adopt a coherent and comprehensive catalogue of human rights, including economic, social and cultural rights, as well as the rights of the child. 103. The Independent Expert recommends that the Government, as a matter of priority, adopt an integrated national human rights plan of action and a human rights institution in conformity with the Paris Principles, mandated to oversee all rights, 21