fixes mass assignment problem
Adds missing organisation types
Adds missing districts