Fix a bug and add visual indicator for district