implemented address search - still buggy