fix related_entity stuff
no district for one-off roles
fix old/new issue