Fixed nesting
Clear up response template
Tag district and continent too.
Merge remote-tracking branch 'upstream/master'