mapping + search date + search hightlight
Merge remote-tracking branch 'origin/master'