Update the facets based on working with the test data

* set the correct fields for the facets
* fix a bug with facetview when handling numeric/date fields