Improved handling of Hokkaidou addresses