More fixes to multi select facets