Facet fields done; WIP