Fixed bug - wrong variable name.
Refactored facet suppression out of templates.