fixed remove and search

fixed remove and search