Fix for reliance on Facet suffix for matching selected facets.  Tided the geographic facet selection.