added search stuffs