fix county lookup
Merge branch 'development'