fix the escape rule (gf treats + as +, not a white space)