Added Location name and country. Country codes is a map. Started work with sort on elastic.
merge
what the hell
Setting default value of "-" on state as elastic is very unhappy with empty strings.
removed unused import