improved the way of searching an address (closes #23)