Merge "Fix truncated issue on search text"