Facet and full text search upgrade