Fixing soum boundaries and name encoding