Fix ambiguity on joining with Municipality. A little hacky, but it works with no present side effects.