some map work. fix search bug.