Fix 0.10.x compatibility with query string contents