diff --git a/app/lib/helpscout/api.rb b/app/lib/helpscout/api.rb
index 127002854..c0538c7a9 100644
--- a/app/lib/helpscout/api.rb
+++ b/app/lib/helpscout/api.rb
@@ -43,7 +43,7 @@ class Helpscout::API
   end
 
   def add_phone_number(email, phone)
-    query = URI.encode("(email:#{email})")
+    query = CGI.escape("(email:#{email})")
     response = call_api(:get, "#{CUSTOMERS}?mailbox=#{user_support_mailbox_id}&query=#{query}")
     if response.success?
       body = parse_response_body(response)
diff --git a/lib/tasks/deployment/20211110093332_set_dossiers_processed_at.rake b/lib/tasks/deployment/20211110093332_set_dossiers_processed_at.rake
index 335d7fbe2..7cb0e3697 100644
--- a/lib/tasks/deployment/20211110093332_set_dossiers_processed_at.rake
+++ b/lib/tasks/deployment/20211110093332_set_dossiers_processed_at.rake
@@ -3,7 +3,7 @@ namespace :after_party do
   task set_dossiers_processed_at: :environment do
     puts "Running deploy task 'set_dossiers_processed_at'"
 
-    dossiers = Dossier.termine.includes(:traitement)
+    dossiers = Dossier.with_discarded.state_termine.includes(:traitement)
     progress = ProgressReport.new(dossiers.count)
 
     dossiers.find_each do |dossier|