Fix single/multi-value field handling, facets, highlighting and add tests!