diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
index 32abe6815..70d70d16f 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list-item.twig
@@ -3,7 +3,7 @@
 {% block ogdata %}
     <meta property="og:site_name"
           content="{{ template.get('og_site_name', setting_value('streams::name', config_get('streams::distribution.name'))) }}"/>
-    <meta property="og:description" content="{{ template.get('og_description', trans(template.meta_description)) }}"/>
+    <meta property="og:description" content="{{ adv.advs_desc|striptags|raw }}"/>
     <meta property="og:title" content="{{ adv.title }}"/>
     <meta property="og:url" content="{{ template.get('og_url', url_current()) }}"/>
     <meta property="og:image" content="{{ adv.getViewPhotoUrl|first }}">
@@ -134,8 +134,11 @@
                                 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 offered-field offered-row">
                                     <span class="icon"><i class="far fa-clock"></i><a
                                                 href="#">{{ adv.created_at|date('d/m/Y') }}</a></span>
-                                    <span class="icon"><i class="fa fa-map-marker"></i><a href="#">{{ adv.city_name }}
+
+                                    {% if setting_value('visiosoft.module.location::detail_page_location') %}
+                                        <span class="icon"><i class="fa fa-map-marker"></i><a href="#">{{ adv.city_name }}
                                             , {{ adv.country_name }}</a></span>
+                                    {% endif %}
                                     {% if adv.isCorporate == 2 %}
                                         <span class="icon"><i class="fa fa-suitcase"></i><a
                                                     href="{{ url_route('visiosoft.module.advs::list_user_ad', [adv.created_by_id]) }}">{{ adv.owner }}</a></span>
@@ -278,7 +281,7 @@
                                         {% include "visiosoft.module.customfields::list-item" %}
                                     {% endif %}
                                 {% endif %}
-                                {% if adv.map_Val != "" %}
+                                {% if adv.map_Val != "" and setting_value('visiosoft.module.location::detail_page_location') %}
                                     <div id="streetviewtab" class="tab-pane fade in">
                                         <div id="map" data-map-val="{{ adv.map_Val }}"></div>
                                         {% if entries('advs').isEnabled('streetview') %}
@@ -334,9 +337,11 @@
                                             </div>
                                             <!-- item-info-right -->
                                             <div class="user-option pull-right">
-                                                <a href="#" data-toggle="tooltip" data-placement="top" title=""
-                                                   data-original-title="{{ advs.city_name }}, {{ advs.country_name }}"><i
-                                                            class="fa fa-map-marker"></i> </a>
+                                                {% if setting_value('visiosoft.module.location::detail_page_location') %}
+                                                    <a href="#" data-toggle="tooltip" data-placement="top" title=""
+                                                       data-original-title="{{ advs.city_name }}, {{ advs.country_name }}"><i
+                                                                class="fa fa-map-marker"></i> </a>
+                                                {% endif %}
                                             </div><!-- item-info-right -->
                                         </div><!-- ad-meta -->
                                     </div><!-- item-info -->
diff --git a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
index f40427d14..df29c234d 100644
--- a/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/advs/list.twig
@@ -60,6 +60,7 @@
                                             <a data-toggle="dropdown" class="sort-by-open-dropdown" href="#" aria-expanded="false">
                                                 <span class="sort-by-selected-text">{{ trans("visiosoft.module.advs::field.pick_option") }}</span><i class="fa fa-caret-square-o-down"></i></a>
                                             <ul class="dropdown-menu sort-by-dropdown" x-placement="bottom-start" >
+                                                <li><a href="#" data-value="all" class="sort-by-item">{{ trans("visiosoft.module.advs::field.pick_option") }}</a></li>
                                                 <li><a href="#" data-value="sort_price_up" class="sort-by-item">{{ trans("visiosoft.module.advs::field.price_high") }}</a></li>
                                                 <li><a href="#" data-value="sort_price_down" class="sort-by-item">{{ trans("visiosoft.module.advs::field.price-low") }}</a></li>
                                                 <li><a href="#" data-value="sort_time" class="sort-by-item">{{ trans("visiosoft.module.advs::field.newest") }}</a></li>
@@ -120,7 +121,9 @@
                                                     </video>">
                                                             <i class="fa fa-film"></i> </a>
                                                     {% endif %}
-                                                    <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                    {% if setting_value('visiosoft.module.location::list_page_location') %}
+                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                     <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                     {% if entries('advs').isEnabled('comparisons') %}
@@ -180,7 +183,9 @@
                                                     <source src='{{ adv.isAdVideo }}' class='video-src' type='video/mp4' />
                                                     </video>"></a>
                                                         {% endif %}
-                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                        {% if setting_value('visiosoft.module.location::list_page_location') %}
+                                                            <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}" data-toggle="tooltip" data-placement="top"  title="{{ adv.city_name }}, {{ adv.country_name }}"><i class="fa fa-map-marker"></i> </a>
+                                                        {% endif %}
                                                         <a class="online" href="" data-toggle="tooltip" data-placement="top" title="{{ adv.owner }}"><i class="fa fa-user"></i> </a>
 
                                                         {% if entries('advs').isEnabled('comparisons') %}
diff --git a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
index 8e6de4e4d..3c73ebfd3 100644
--- a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
+++ b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig
@@ -9,6 +9,7 @@
                 <form action="{{ url('advs/list') }}" id="home-page-search-form" method="get">
                     <div class="row">
                         <div class="col-md-12">
+                            {% if setting_value('visiosoft.module.location::home_page_location') %}
                             <div class="col-md-2 home-search-field">
                                 <div class="form-group ">
                                     {% set cities = entries('location','cities').orderBy('slug').get() %}
@@ -21,6 +22,9 @@
                                 </div>
                             </div>
                             <div class="col-md-2 home-search-field">
+                                {% else %}
+                                <div class="col-md-4 home-search-field">
+                                    {% endif %}
                                 <div class="form-group ">
                                     <ul>
                                         <li class="dropdown home-search-category-field">
@@ -159,10 +163,12 @@
                                                                title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                         class="fa fa-shopping-cart"></i> </a>
                                                         {% endif %}
-                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
-                                                           data-toggle="tooltip" data-placement="top"
-                                                           title="{{ adv.city_name }}, {{ adv.country_name }}"><i
-                                                                    class="fa fa-map-marker"></i> </a>
+                                                        {% if setting_value('visiosoft.module.location::home_page_location') %}
+                                                            <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
+                                                               data-toggle="tooltip" data-placement="top"
+                                                               title="{{ adv.city_name }}, {{ adv.country_name }}"><i
+                                                                        class="fa fa-map-marker"></i> </a>
+                                                        {% endif %}
                                                     </div><!-- item-info-right -->
                                                 </div><!-- ad-meta -->
                                             </div><!-- featured -->
@@ -252,10 +258,12 @@
                                                            title="{{ adv.city_name }}, {{ adv.country_name }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
-                                                    <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
-                                                       data-toggle="tooltip" data-placement="top"
-                                                       title="{{ adv.city_name }}, {{ adv.country_name }}"><i
-                                                                class="fa fa-map-marker"></i> </a>
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
+                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
+                                                           title="{{ adv.city_name }}, {{ adv.country_name }}"><i
+                                                                    class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
@@ -318,10 +326,12 @@
                                                            title="{{ trans('visiosoft.module.advs::field.online_shopping') }}"><i
                                                                     class="fa fa-shopping-cart"></i> </a>
                                                     {% endif %}
-                                                    <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
-                                                       data-toggle="tooltip" data-placement="top"
-                                                       title="{{ adv.city_name }}, {{ adv.country_name }}"><i
-                                                                class="fa fa-map-marker"></i> </a>
+                                                    {% if setting_value('visiosoft.module.location::home_page_location') %}
+                                                        <a href="{{ url_route('visiosoft.module.advs::show_ad_map_location',[adv.country_id,adv.city,adv.district]) }}"
+                                                           data-toggle="tooltip" data-placement="top"
+                                                           title="{{ adv.city_name }}, {{ adv.country_name }}"><i
+                                                                    class="fa fa-map-marker"></i> </a>
+                                                    {% endif %}
                                                 </div><!-- item-info-right -->
                                             </div><!-- ad-meta -->
                                         </div><!-- item-info -->
diff --git a/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig b/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
index 2812add21..7cbb60825 100644
--- a/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
+++ b/addons/default/visiosoft/default-theme/resources/views/partials/footer.twig
@@ -152,4 +152,5 @@
         gtag('config', '{{ setting('visiosoft.module.advs::google_statistic_code') }}');
     </script>
 
-{% endif %}
\ No newline at end of file
+{% endif %}
+        {{ blocks('advs-default-theme-footercss-bottom') }}
\ No newline at end of file