Minor fix for city and state comma

Proper nesting of the facet check for state.