Address search fix (issue #227)