diff --git a/app/models/procedure_presentation.rb b/app/models/procedure_presentation.rb
index abcda68bf..bdc87b0ca 100644
--- a/app/models/procedure_presentation.rb
+++ b/app/models/procedure_presentation.rb
@@ -49,11 +49,11 @@ class ProcedurePresentation < ApplicationRecord
     explanatory_types_de_champ = [:header_section, :explication].map { |k| TypeDeChamp.type_champs.fetch(k) }
 
     fields.concat procedure.types_de_champ
-      .reject { |tdc| explanatory_types_de_champ.include?(tdc.type_champ) }
+      .where.not(type_champ: explanatory_types_de_champ)
       .map { |type_de_champ| field_hash(type_de_champ.libelle, 'type_de_champ', type_de_champ.id.to_s) }
 
     fields.concat procedure.types_de_champ_private
-      .reject { |tdc| explanatory_types_de_champ.include?(tdc.type_champ) }
+      .where.not(type_champ: explanatory_types_de_champ)
       .map { |type_de_champ| field_hash(type_de_champ.libelle, 'type_de_champ_private', type_de_champ.id.to_s) }
 
     fields
diff --git a/app/uploaders/procedure_logo_uploader.rb b/app/uploaders/procedure_logo_uploader.rb
index c38970ac0..6538230b6 100644
--- a/app/uploaders/procedure_logo_uploader.rb
+++ b/app/uploaders/procedure_logo_uploader.rb
@@ -28,9 +28,9 @@ class ProcedureLogoUploader < BaseUploader
     if file.present?
       if original_filename.present? || model.logo_secure_token
         if Flipflop.remote_storage?
-          filename = "#{model.class.to_s.underscore}-#{secure_token}.#{file.extension.downcase}"
+          filename = "#{model.class.to_s.underscore}-#{secure_token}.#{file.extension&.downcase}"
         else
-          filename = "logo-#{secure_token}.#{file.extension.downcase}"
+          filename = "logo-#{secure_token}.#{file.extension&.downcase}"
         end
       end
       filename
diff --git a/db/migrate/20190226105641_add_procedure_id_index_to_types_de_champ.rb b/db/migrate/20190226105641_add_procedure_id_index_to_types_de_champ.rb
new file mode 100644
index 000000000..52fe10271
--- /dev/null
+++ b/db/migrate/20190226105641_add_procedure_id_index_to_types_de_champ.rb
@@ -0,0 +1,5 @@
+class AddProcedureIdIndexToTypesDeChamp < ActiveRecord::Migration[5.2]
+  def change
+    add_index :types_de_champ, :procedure_id
+  end
+end
diff --git a/db/schema.rb b/db/schema.rb
index 05ee04c74..2220f2215 100644
--- a/db/schema.rb
+++ b/db/schema.rb
@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 2019_02_13_144145) do
+ActiveRecord::Schema.define(version: 2019_02_26_105641) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -545,6 +545,7 @@ ActiveRecord::Schema.define(version: 2019_02_13_144145) do
     t.bigint "parent_id"
     t.index ["parent_id"], name: "index_types_de_champ_on_parent_id"
     t.index ["private"], name: "index_types_de_champ_on_private"
+    t.index ["procedure_id"], name: "index_types_de_champ_on_procedure_id"
     t.index ["stable_id"], name: "index_types_de_champ_on_stable_id"
   end