[core] preserve %2b and %2B in query string (fixes #2999)