Bug fix for subdistrict formfield