solve search bug
solve map bug