Add country name to index
Don't blanket secure all search views
Merge branch 'master' into portal_dev