Fix address search bug