updated search stuffs