do some fix on search feature