modify search action on timeline-view
Merge branch 'develop'