district office updates (#993)

* district office updates

* Removed extra trailing white-spaces

* Fixed additional lint errors

* fix some validation errors

---------

Co-authored-by: anero <[email protected]>

Author: arrighik