Improve address matching