Improve clear address search