Improve symbol matching for multi-word input GitOrigin-RevId: a12ff1e1ccc38acab8be47fd2f5bcdca2c6c6859