Make data provider contact fields mandatory again
Change 'tags' facet to 'keywords'