National: improved facet collapsability & added icons.