Cosmetic changes + addFilterType.xhtml