Major change to correctly handle facets
WARNING ! Need database update (table resto.facets)