[PD-452] Fix State filters

Applied against my new merge branch, but otherwise does the same thing-- uses state synonyms for state filtering and also expands the states json file to include missing territories.
Do you need to import states? I'm getting "global name 'states' is not defined'