Tentative fix for the query string being endlessly concatenated on retries