[FIX] Escape some query parameters