Add labels for facet query fields.
Format remove links for facet queries.
Merge branch 'mattdev'