Updated facet attribute extraction to match attributes generically. Tooltips still have to be updated.