Add searching message
Merge branch 'searching-message' into cbx4