Fix searching template
Merge branch 'searching-message' into cbx4