diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
index f411f6b22..ecc9f995c 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig
@@ -29,9 +29,9 @@
             <div class="col-md-4 py-1 px-0">
                 <select name="currency" id="currency" class="form-control">
                     {% for currency in active_currencies %}
-                        <option {% if app.request.get('currency') == currency %}
-                                selected
-                                {% endif %}value="{{ currency }}">{{ currency_symbol(currency) }}</option>
+                        <option {{ app.request.get('currency') == currency ? 'selected' }} value="{{ currency }}">
+                            {{ currency_symbol(currency) }}
+                        </option>
                     {% endfor %}
                 </select>
             </div>
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
index 3eb0e3e06..c1a714f3e 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
@@ -91,8 +91,10 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
                 });
             }
         }
-        if (!empty($param['country'])) {
-            $query = $query->where('country_id', $param['country']);
+        $country = isset($param['country']) ?
+            $param['country'] : setting_value('visiosoft.module.location::default_country');
+        if ($country) {
+            $query = $query->where('country_id', $country);
         }
         if ($city) {
             $query = $query->where('city', $city->id);
diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
index 7681901a8..683f018e9 100644
--- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
+++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
@@ -3,14 +3,21 @@
         <b>
             <span class="float-left">{{ trans('visiosoft.module.location::field.address.name') }}</span>
         </b>
-        {% set country = setting_value('visiosoft.module.location::default_country') %}
-        {% if app.request.get('country') %}
-            {% set country =  app.request.get('country') %}
-        {% endif %}
+        {% set defaultCountry = setting_value('visiosoft.module.location::default_country') %}
+        {% set selectedCountry =  app.request.get('country') %}
         <a href="#" class="a-sahibinden-type selected-country filter-country-btn float-right">
-            <small>{{ getCountry(country).name }}</small>
+            {% set countryValue = '' %}
+            {% if selectedCountry %}
+                {% set countryName = getCountry(selectedCountry).name %}
+                {% set countryValue = defaultCountry == selectedCountry ? '' : selectedCountry %}
+            {% elseif defaultCountry %}
+                {% set countryName = getCountry(defaultCountry).name %}
+            {% else %}
+                {% set countryName = trans("visiosoft.module.location::field.country.name") %}
+            {% endif %}
+            <small>{{ countryName }}</small>
         </a>
-        <input name="country" value="{{ country }}" type="hidden">
+        <input name="country" value="{{ countryValue }}" type="hidden">
     </div>
     <div class="col-12 px-0 py-1">
         <button type="button" class="btn btn-default border border-1 w-100 filter-city-btn" data-toggle="modal"