Improved address parsing, introduces intersection bug