search and some fix

this fixed #9