fix search marquee
Merge branch 'develop'