Made gis_terms be a set, rather than a dict with None for all keys.