fix empty serch string for highlighting
Merge branch 'v3' into pergam_v3