Handle the plus in words like "Google+" or "A+B" in the seach (see #4497)