Merge "Set correct forecolor when searching" into jb-dev