diff --git a/app/models/appearance_release.rb b/app/models/appearance_release.rb
index 905538e..387c0de 100644
--- a/app/models/appearance_release.rb
+++ b/app/models/appearance_release.rb
@@ -19,7 +19,7 @@ class AppearanceRelease < ApplicationRecord
   composed_of :person_address,
               class_name: 'Address',
               mapping: [
-                  %w[person_address_street1 street1],
+                %w[person_address_street1 street1],
                   %w[person_address_street2 street2],
                   %w[person_address_city city],
                   %w[person_address_state state],
@@ -82,7 +82,19 @@ class AppearanceRelease < ApplicationRecord
   scope :having_no_person_photo,            -> { left_joins(:person_photo_attachment).group(:id).having('COUNT(active_storage_attachments) = 0') }
   scope :with_person_name,                  ->(name) { where('person_first_name ILIKE ? OR person_last_name ILIKE ?', "%#{name}%") }
 
-  searchable_on %i[person_first_name person_last_name person_address person_email person_phone]
+  searchable_on %i[
+    person_first_name
+    person_last_name
+    person_address_old
+    person_address_street1
+    person_address_street2
+    person_address_city
+    person_address_state
+    person_address_zip
+    person_address_country
+    person_email
+    person_phone
+  ]
 
   def person_address
     return self.person_address_old if self.person_address_old.present?
diff --git a/app/models/sample_appearance_release.rb b/app/models/sample_appearance_release.rb
index e2e0a20..5107365 100644
--- a/app/models/sample_appearance_release.rb
+++ b/app/models/sample_appearance_release.rb
@@ -8,7 +8,13 @@ class SampleAppearanceRelease < AppearanceRelease
 
   def default_attrs
     {
-      person_address: "Street Address, City, State Zipcode",
+      person_address_old: "Street Address, City, State Zipcode",
+      person_address_street1: "St1",
+      person_address_street2: "St2",
+      person_address_city: "City",
+      person_address_state: "State",
+      person_address_zip: "ZIP",
+      person_address_country: "Country",
       person_first_name:    "Some",
       person_last_name:     "Person",
       person_phone:   "555-555-5555",
diff --git a/config/locales/en.yml b/config/locales/en.yml
index fb64905..c606755 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -329,6 +329,7 @@ en:
         person_title: Title
       appearance_release:
         minor: Is the person a minor?
+        person_address_old: Address
         person_address: Address
         person_address_city: City
         person_address_country: Country
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 113dfdd..44d005d 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -125,6 +125,7 @@ es:
         person_address_street2: Address (Line 2) (ES)
         minor: El firmante es un menor
         person_address: Dirección
+        person_address_old: Dirección
         person_email: Dirección de correo electrónico
         person_name: Nómbre
         person_phone: Número de teléfono