Correcting last commit to make the display deal with all core_xxx.xml