added + to %20 replacement after QueryEscape