[fix] Only append the query string once