diff --git a/archive-xarxaprod-associat.php b/archive-xarxaprod-associat.php
index 86e5680..6ad2be2 100644
--- a/archive-xarxaprod-associat.php
+++ b/archive-xarxaprod-associat.php
@@ -21,21 +21,20 @@ get_header();
 
     <section id="filteredassociats" class="xarxaprod-filtered-content xarxaprod-filtered-associats xarxaprod-associats-filtrats">
       <aside id="associatsfilter" class="xarxaprod-filter-associats xarxaprod-filtre-associats">
-        <?php include_once( ABSPATH . 'wp-admin/includes/plugin.php' ); if ( is_plugin_active( 'xarxaprod-wp-plugin/xarxaprod-wp-plugin.php' ) ) { // if plugin active do?> 
-          <?php xarxaprod_associats_filters_form(); // function defined in the plugin ?>
-        <?php  } //end if is_plugin_active ?>
+       <?php xarxaprod_associats_filters_form(); // function defined in the plugin ?>
       </aside>
-
       <content class="archive-posts <?php xarxaprod_class_posttype(); ?>">
+      <figure id="xarxaprod-associats-map" class="xarxaprod-associats-map">
+        <?php xarxaprod_show_leaflet_map(); // function defined in the plugin ?>
+      </figure>
 
   		<?php if ( have_posts() ) : ?>
   			<?php while ( have_posts() ) : the_post();
-  
-  		    get_template_part( 'template-parts/section', 'eachmember' ); 
-  
+  		    //get_template_part( 'template-parts/section', 'eachmember' ); 
+          xarxaprod_show_leaflet_associat_blob(); // function defined in the plugin 
   			endwhile;
 
-        the_posts_navigation();
+        //the_posts_navigation();
   
   		else :
   
diff --git a/page-templates/associats-search.php b/page-templates/associats-search.php
index 3b5ab0c..0e61e4e 100644
--- a/page-templates/associats-search.php
+++ b/page-templates/associats-search.php
@@ -61,67 +61,28 @@ get_header();
       ?>
   
       <?php if ( $the_query_associat->have_posts() ) : ?>
-        <?php 
-        // Detect plugin. For use on Front End only.
-        include_once( ABSPATH . 'wp-admin/includes/plugin.php' );
-        // check for plugin using plugin name
-        if ( is_plugin_active( 'leaflet-map/leaflet-map.php' ) ) { ?>                    
-          <content>
-            <main id="espais-associats-map" class="espais-map" style="height: 55vh; widht: 100%;">
-              <?php
-               // show the map even if empty
-              echo do_shortcode( '[leaflet-map fitbounds lat="41.3922" lng="2.1755" height="100%" width="100%" tileurl=https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}{r}.png  scrollwheel detect-retina]');
-              ?>
+          <content class="archive-posts archive-posts-map archive-xarxaprod-members archive-xarxaprod-associats <?php xarxaprod_class_posttype(); ?>">
+            <figure id="espais-associats-map" class="xarxaprod-associats-map xarxaprod-espais-map">
+
+              <?php xarxaprod_show_leaflet_map(); // function defined in the plugin ?>
      
               <?php while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post(); ?>
   
-              <?php 
-                // get the field values
-                // https://www.advancedcustomfields.com/resources/get_field/
-                // var_dump get_field('');
-                $args = get_field('xxp_associat_osm_map',false, false);
-             
-                if ( count( $args['markers'] ) ) { 
-                  foreach ( $args['markers'] as $marker ) {
-                    // define the fields for the blob
-                    if ( get_field('xxp_associat_citymap') ){
-                      // if city for map written use it
-                      $associat_address = get_field('xxp_associat_citymap'); 
-                    } else {
-                      // else use the ACF OpenStreetMap nominatim value
-                      $associat_address = $marker['label'];
-                    };
-                    $associat_xxp_weblink = '<a href="'. get_the_permalink() . '">' . get_the_title() . '</a>';
-                    $associat_own_weblink = '<a href="' . get_field('xxp_associat_web') . '" class="">' . get_field('xxp_associat_web') . '</a>';
-                    $associat_email = '<a href="mailto:' . get_field('xxp_associat_mail') . '" class="">' . get_field('xxp_associat_mail') . '</a>';
-                    $associat_lat = $marker['lat'];
-                    $associat_lng = $marker['lng'];
-                    $associat_blobcolor = get_field('xxp_associat_colormap');
-                    echo do_shortcode( '
-                        [leaflet-marker svg background="#555" color="#555" iconSize="17,19" iconClass="dashicons dashicons-marker" opacity="0.6" lat=' . $associat_lat . ' lng=' . $associat_lng . ']' 
-                        . '<p>' . $associat_address . '</p>'
-                        . '<h5><b>' . $associat_xxp_weblink . '</b></h5>'
-                        . '<p>' . $associat_own_weblink . '</p>'
-                        . '<p>' . $associat_email . '</p>'
-                        . '[/leaflet-marker]' 
-                    ); // end shortcode each marker
-                  }; // end each marker     
-                }; // end count all markers 
-?>
-             <?php endwhile;//end of the loop ?>
-             <?php wp_reset_postdata(); ?>
-            </main>
-  	    	</content>
-        <?php
-         } else {
-           // if no leaflet plugin, show card with each member
-        ?>
-          <content class="archive-posts archive-xarxaprod-members archive-xarxaprod-associats <?php //xarxaprod_class_posttype(); ?>">
-              <?php while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post(); ?>
-              <?php get_template_part( 'template-parts/section', 'eachmember' ); ?>
-             <?php endwhile;//end of the loop ?>
-  	  	  </content>
-        <?php }//end else plugin control?>
+                <?php xarxaprod_show_leaflet_associat_blob(); ?>
+
+              <?php endwhile;//end of the loop ?>
+
+            </figure>
+            <?php wp_reset_postdata(); ?>
+          </content>
+          <?php
+          //the loop for text output
+          //echo '<content class="archive-posts archive-xarxaprod-members archive-xarxaprod-associats' . xarxaprod_class_posttype() . '">';
+              //while ( $the_query_associat->have_posts() ) : $the_query_associat->the_post();
+                //get_template_part( 'template-parts/section', 'eachmember' );
+             //endwhile;//end of the loop
+  	  	  //echo '</content>';
+          ?>
       <?php endif; //end query associat ?>
   
     </section>
diff --git a/template-parts/content-xarxaprod-associat.php b/template-parts/content-xarxaprod-associat.php
index 1146cdc..f0d2e1b 100644
--- a/template-parts/content-xarxaprod-associat.php
+++ b/template-parts/content-xarxaprod-associat.php
@@ -100,7 +100,13 @@
 	  <?php if( get_field('xxp_associat_osm_map') ): ?>
 		<div class="xarxaprod-associat-osm-map">
 			<h6 class="">Mapa:</h6>
-      <figure><?php the_field('xxp_associat_osm_map'); ?></figure>
+			<figure class="xarxaprod-associats-map">
+		  	<?php 
+		     xarxaprod_show_leaflet_map();
+         xarxaprod_show_leaflet_associat_blob();
+		    ?>
+				<?php //the_field('xxp_associat_osm_map'); ?>
+      </figure>
 	  </div>
     <?php endif; ?>
 	  <?php if( get_field('xxp_associat_osm_link') ): ?>