UIVSUP-148: Theme facet broken when not combined with type facet