Got district filtering working. Don't ignore language. Don't ignore format for English. Cleaned up code. Issue: #515
Merge branch 'develop' into custom-forms