Hack around formatting issue
Add country name to index
Don't blanket secure all search views
Merge remote-tracking branch 'upstream/master'