Add search by country, rework index.html templating
Be more selective when matching states