diff --git a/ReferenceDataApp/admin.py b/ReferenceDataApp/admin.py
index cfdc46c..d66f2c1 100644
--- a/ReferenceDataApp/admin.py
+++ b/ReferenceDataApp/admin.py
@@ -9,6 +9,7 @@ class Admin_Country(Admin_Trans_BaseModel):
         'short_code', 'code',
         'enable', 'area_id', 'parsing_finished_DT',
         'order', 'modifiedDT', 'createDT']
+    search_fields = ['id', 'name_en', 'name_ru', 'short_code', 'code']
 admin.site.register(Country, Admin_Country)
 
 class Admin_City(Admin_Trans_BaseModel):
@@ -17,6 +18,7 @@ class Admin_City(Admin_Trans_BaseModel):
         'country',
         'enable', 'area_id', 'parsing_finished_DT',
         'order', 'modifiedDT', 'createDT']
+    search_fields = ['id', 'name_en', 'name_ru', 'country__name']
 admin.site.register(City, Admin_City)
 
 class Admin_Airport(Admin_Trans_BaseModel):
@@ -26,4 +28,5 @@ class Admin_Airport(Admin_Trans_BaseModel):
         'international_name',
         'enable', 'area_id', 'parsing_finished_DT',
         'order', 'modifiedDT', 'createDT']
+    search_fields = ['id', 'name_en', 'name_ru', 'city', 'iata_code', 'icao_code', 'international_name']
 admin.site.register(Airport, Admin_Airport)
\ No newline at end of file
diff --git a/ReferenceDataApp/funcs.py b/ReferenceDataApp/funcs.py
index bf9ef70..0cb7a46 100644
--- a/ReferenceDataApp/funcs.py
+++ b/ReferenceDataApp/funcs.py
@@ -173,7 +173,7 @@ def parse_data():
                 kwargs = {}
                 if city_Dict['name:en']:
                     kwargs.update({'name_en': city_Dict['name:en']})
-                elif city_Dict['name:ru']:
+                if city_Dict['name:ru']:
                     kwargs.update({'name_ru': city_Dict['name:ru']})
 
                 try:
diff --git a/ReferenceDataApp/js_views.py b/ReferenceDataApp/js_views.py
index 5eab746..e8aadc9 100644
--- a/ReferenceDataApp/js_views.py
+++ b/ReferenceDataApp/js_views.py
@@ -46,8 +46,15 @@ def get_address_point_ajax(request):
         for item in res_data:
             item['index'] = i
             item['ctrl_name'] = data['ctrl_name']
-            item['airport_fullname_html'] = f'<b>{item["iata_code"]}</b> - {item["name"]}'
-            item['airport_fullname'] = f'{item["iata_code"]} - {item["name"]}'
+            if 'iata_code' in item:
+                item['airport_fullname'] = f'<b>{item["iata_code"]}</b> - {item["name"]}'
+                item['fullname'] = f'{item["iata_code"]} - {item["name"]}'
+                item['city_name'] = item['city__name']
+                item['country_name'] = item['city__country__name']
+            else:
+                item['city_name'] = item['name']
+                item['country_name'] = item['country__name']
+                item['fullname'] = f'{item["country_name"]} / {item["city_name"]}'
             html = f"{html}{render_to_string('widgets/w_ac_input_address_point.html', item)}"
             i += 1
 
diff --git a/templates/widgets/w_ac_input_address_point.html b/templates/widgets/w_ac_input_address_point.html
index 85a47fe..116e148 100644
--- a/templates/widgets/w_ac_input_address_point.html
+++ b/templates/widgets/w_ac_input_address_point.html
@@ -1,4 +1,4 @@
- <div onclick='selectItemAddrPoint({{ id }}, "{{ airport_fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}">
-        <div>{{ airport_fullname_html|safe }}</div>
-        <div class="autocomplete-location">{{ city__name }}, {{ city__country__name }}</div>
+ <div onclick='selectItemAddrPoint({{ id }}, "{{ fullname }}", "{{ ctrl_name }}")' class="autocomplete-result" data-index="{{ index }}">
+        {% if airport_fullname %}<div>{{ airport_fullname|safe }}</div>{% endif %}
+        <div class="autocomplete-location">{{ country_name }} / {{ city_name }}</div>
  </div>
\ No newline at end of file