IMprovements in Facets.jsp