diff --git a/archive-xarxaprod-ajut.php b/archive-xarxaprod-ajut.php
index 06a0525..c947600 100644
--- a/archive-xarxaprod-ajut.php
+++ b/archive-xarxaprod-ajut.php
@@ -31,22 +31,78 @@ get_header();
       </aside>
 
       <content class="archive-posts <?php xarxaprod_class_posttype(); ?>">
+      <?php 
+      // very wired, need to output 
+      //   1. today's events 'compare' => '='
+      //   2. then after today 'compare' => '>'
+      //
+      // if done with '>=' outputs 
+      //   1. older dates in asc order
+      //   2. at the end today
+      ?>
 
-  		<?php if ( have_posts() ) : ?>
-  			<?php while ( have_posts() ) : the_post();
-  
-  		    get_template_part( 'template-parts/section', 'eachfund' ); 
-  
-  			endwhile;
+<?php
+    // https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
+    // https://www.advancedcustomfields.com/resources/checkbox/#query-posts
+    // https://barn2.com/blog/querying-posts-by-custom-field-acfi/
+ 
+    $the_query_ajut = new WP_Query(
+      array(
+        'post_type'     => 'xarxaprod-ajut',
+        'posts_per_page' => '-1',
+        'meta_key'       => 'xxp_fund_apply_end', // order by meta key convo apply end
+        'meta_query'     => array(
+          array(    //filter results show only older than today
+            'key'     => 'xxp_fund_apply_end',
+            'value'   => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
+            'compare' => '=', //show events from today and later
+            'type'    => 'DATE',
+          )
+        ),
+        //https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters
+        'orderby'   => 'meta_value', //order by meta value
+        'order'     => 'ASC', //order ascendent
+      )
+    ); 
+    ?>
+    <?php if ( $the_query_ajut->have_posts() ) : ?>
+      <?php while ( $the_query_ajut->have_posts() ) : $the_query_ajut->the_post(); ?>
+ 
+       <?php get_template_part( 'template-parts/section', 'eachfund' ); ?>
+ 
+      <?php endwhile;//end of the loop ?>
+      <?php wp_reset_postdata(); ?>
+    <?php endif; //end query ajut ?>
+    <?php
+ 
+    $the_query_ajut = new WP_Query(
+      array(
+        'post_type'     => 'xarxaprod-ajut',
+        'posts_per_page' => '-1',
+        'meta_key'       => 'xxp_fund_apply_end', // order by meta key convo apply end
+        'meta_query'     => array(
+          array(    //filter results show only older than today
+            'key'     => 'xxp_fund_apply_end',
+            'value'   => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
+            'compare' => '>', //show events from today and later
+            'type'    => 'DATE',
+          )
+        ),
+        //https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters
+        'orderby'   => 'meta_value', //order by meta value
+        'order'     => 'ASC', //order ascendent
+      )
+    ); 
+    ?>
+    <?php if ( $the_query_ajut->have_posts() ) : ?>
+      <?php while ( $the_query_ajut->have_posts() ) : $the_query_ajut->the_post(); ?>
+ 
+       <?php get_template_part( 'template-parts/section', 'eachfund' ); ?>
+ 
+      <?php endwhile;//end of the loop ?>
+      <?php wp_reset_postdata(); ?>
+    <?php endif; //end query ajut ?>
 
-        the_posts_navigation();
-  
-  		else :
-  
-  			get_template_part( 'template-parts/content', 'none' );
-  
-  		endif;
-  		?>
 
 			</content>
   <section id="filteredfunds" class="xarxaprod-filtered-content xarxaprod-filtered-funds xarxaprod-ajuts-filtrats">
diff --git a/archive-xarxaprod-convo.php b/archive-xarxaprod-convo.php
index 3bf1ba3..f9a42aa 100644
--- a/archive-xarxaprod-convo.php
+++ b/archive-xarxaprod-convo.php
@@ -21,6 +21,7 @@ get_header();
  
     <header class="page-header">
       <h1><?php //single_term_title( ' ' ); ?></h1>
+this is achive-xarxaprod-convo.php
     </header>
  
       <aside id="convosfilter" class="xarxaprod-filter-convos xarxaprod-filtre-convos">
@@ -31,17 +32,15 @@ get_header();
 
       <content class="archive-posts <?php xarxaprod_class_posttype(); ?>">
 
-      <?php
-      // loop by default in archive.php
-      //if ( have_posts() ) :
-      // while ( have_posts() ) : the_post();
-  		//    get_template_part( 'template-parts/section', 'eachconvo' ); 
-  		//	endwhile;
-      //  the_posts_navigation();
-  		//else :
-  		//	get_template_part( 'template-parts/content', 'none' );
-  		//endif;
-  		?>
+      <?php 
+      // very wired, need to output 
+      //   1. today's events 'compare' => '='
+      //   2. then after today 'compare' => '>'
+      //
+      // if done with '>=' outputs 
+      //   1. older dates in asc order
+      //   2. at the end today
+      ?>
 
      <?php
       // https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
@@ -50,18 +49,49 @@ get_header();
       $the_query_convo = new WP_Query(
         array(
           'post_type'      => 'xarxaprod-convo',
-          'order_by'       => 'meta_value', //order by meta value
-          'meta_key'       => 'xxp_convo_apply_end', // order by meta key convo apply end
-          'order'          => 'ASC', //order ascendent
           'posts_per_page' => '-1', //show all                               
+          'meta_key'       => 'xxp_convo_apply_end', // order by meta key convo apply end
           'meta_query'     => array(
             array(    //filter results show only older than today
               'key'     => 'xxp_convo_apply_end', 
               'value'   => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
-              'compare' => '>=', //show events from today and later
+              'compare' => '=', //show events from today and later
               'type'    => 'DATE',
             )
-          )
+          ),
+          'order_by'       => 'meta_value', //order by meta value
+          'order'          => 'ASC', //order ascendent
+        )
+      ); 
+      ?>
+      <?php if ( $the_query_convo->have_posts() ) : ?>
+        <?php while ( $the_query_convo->have_posts() ) : $the_query_convo->the_post(); ?>
+  
+         <?php get_template_part( 'template-parts/section', 'eachconvo' , $the_query_convo); ?>
+  
+        <?php endwhile;//end of the loop ?>
+        <?php wp_reset_postdata(); ?>
+      <?php endif; ?>
+
+     <?php
+      // https://support.advancedcustomfields.com/forums/topic/wp_query-using-meta_query-for-an-acf-checkbox-field/#post-145830
+      // https://www.advancedcustomfields.com/resources/checkbox/#query-posts
+      // https://barn2.com/blog/querying-posts-by-custom-field-acfi/
+      $the_query_convo = new WP_Query(
+        array(
+          'post_type'      => 'xarxaprod-convo',
+          'posts_per_page' => '-1', //show all                               
+          'meta_key'       => 'xxp_convo_apply_end', // order by meta key convo apply end
+          'meta_query'     => array(
+            array(    //filter results show only older than today
+              'key'     => 'xxp_convo_apply_end', 
+              'value'   => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
+              'compare' => '>', //show events from today and later
+              'type'    => 'DATE',
+            )
+          ),
+          'order_by'       => 'meta_value', //order by meta value
+          'order'          => 'ASC', //order ascendent
         )
       ); 
       ?>
diff --git a/archive.php b/archive.php
index 727a3b9..3a68516 100644
--- a/archive.php
+++ b/archive.php
@@ -38,29 +38,76 @@ get_header();
 			<content class="archive-posts <?php xarxaprod_class_posttype(); ?>">
 			<?php
 			/* Start the Loop */
-			while ( have_posts() ) :
-				the_post();
+			//while ( have_posts() ) :
+			//	the_post();
 
-				/*
-				 * Include the Post-Type-specific template for the content.
-				 * If you want to override this in a child theme, then include a file
-				 * called content-___.php (where ___ is the Post Type name) and that will be used instead.
-				 */
-				//get_template_part( 'template-parts/content', get_post_type() );
+        if( in_category('faq') ) { 
+			    while ( have_posts() ) :
+			    	the_post();
+              get_template_part( 'template-parts/section', 'each-faq' );
+			    endwhile;
+			    the_posts_navigation();
+					//end if is_category faq 
+				} elseif (in_category( array( 'activitats') ) ) {
+					//get_template_part( 'template-parts/section', 'each-agenda-entry' );
 
-        get_template_part( 'template-parts/section', 'each-agenda-entry' );
+          $the_query_archive_activitats = new WP_Query(                                                      
+            array(
+              'post_type'      => 'post',
+              'posts_per_page' => '-1', //show all => -1
+              'tax_query'      => array(
+                array(
+                  'taxonomy'   => 'category',
+                  'field'      => 'slug',
+                  'terms'      => 'activitats'
+                )
+              ),
+              'meta_query'     => array(
+                array(    //filter results show only older than today
+                  'key'     => 'xxp_agenda_date_end',
+                  'value'   => date("Y-m-d"), // consider using date_i18n() https://developer.wordpress.org/reference/functions/date_i18n/
+                  'compare' => '>', //show events before today
+                  'type'    => 'DATE',
+                )
+              ),
+              'order_by'       => 'meta_value', //order by meta value
+              'order'          => 'ASC', //order ascendent
+            ) 
+          );  
+          if ( $the_query_archive_activitats->have_posts() ) :
+            while ( $the_query_archive_activitats->have_posts() ) : $the_query_archive_activitats->the_post(); 
+             
+            get_template_part( 'template-parts/section', 'each-agenda-entry' );
+             
+            endwhile;//end of the loop 
+           // pagination will not work for custom_query, why and fix: https://wordpress.stackexchange.com/a/120408
+           // the_posts_navigation();
+					endif; //end if the_query_archive_activitats
 
-			endwhile;
+					wp_reset_postdata(); //reset custom query
 
-			the_posts_navigation();
-      echo '</content>';
+					//end in_category agenda activitats
+				}else{
+					//the rest of archives
+			    while ( have_posts() ) :
+			    	the_post();
+				    /*
+				     * Include the Post-Type-specific template for the content.
+				     * If you want to override this in a child theme, then include a file
+				     * called content-___.php (where ___ is the Post Type name) and that will be used instead.
+				     */
+				    //get_template_part( 'template-parts/content', get_post_type() );
+              get_template_part( 'template-parts/section', 'each-entry' );
+			    endwhile;
+			    the_posts_navigation();
+				}
 
-		else :
-			get_template_part( 'template-parts/content', 'none' );
+			else : //no if have_posts
 
-		endif;
+			get_template_part( 'template-parts/content', 'none' ); ?>
 
-    ?>
+    </content>
+    <?php endif; //end if have_posts?>
 
 	</main><!-- #main -->
 
diff --git a/page-templates/arxiu-general.php b/page-templates/arxiu-general.php
index 92ed13c..034cc60 100644
--- a/page-templates/arxiu-general.php
+++ b/page-templates/arxiu-general.php
@@ -110,7 +110,7 @@ get_header();
               'terms'      => 'activitats'
             )
           ),
-          //'order_by'       => 'meta_value', //order by meta value
+          'order_by'       => 'meta_value', //order by meta value
           //'meta_key'       => 'xxp_convo_apply_end', // order by meta key convo apply end
           'order'          => 'ASC', //order ascendent
           'meta_query'     => array(
diff --git a/page-templates/convos-search.php b/page-templates/convos-search.php
index 42315ab..f65c5e4 100644
--- a/page-templates/convos-search.php
+++ b/page-templates/convos-search.php
@@ -18,7 +18,8 @@ get_header();
 
 		<?php if ( have_posts() ) : ?>
 
-			<header class="page-header">
+      <header class="page-header">
+this is convo-search.php
 			</header><!-- .page-header -->
 			<?php
 			while ( have_posts() ) :
@@ -61,7 +62,7 @@ get_header();
               'type'    => 'DATE',
             )
           ),
-                    //https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters
+          //https://developer.wordpress.org/reference/classes/wp_query/#order-orderby-parameters
           'orderby'   => 'meta_value', //order by meta value
           'order'     => 'ASC', //order ascendent
         )
diff --git a/template-parts/section-each-entry.php b/template-parts/section-each-entry.php
new file mode 100644
index 0000000..869b5e6
--- /dev/null
+++ b/template-parts/section-each-entry.php
@@ -0,0 +1,35 @@
+<?php
+/**
+ * Template part for displaying posts from category "agenda"
+ *
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
+ *
+ * @package Xarxaprod_theme
+ * @used by template-parts/content-post.php
+ * @shown in : archive category
+ *
+ */
+
+?>
+      <article id="post-<?php the_ID(); ?>" <?php post_class('xarxaprod-card-each'); ?> >
+         <h3 class="entry-title">
+           <a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>" rel="bookmark">
+             <?php the_title(); ?>
+           </a>
+         </h3>
+
+          <?php if ( get_the_excerpt() ){ ?>
+          <section class="excerpt post-excerpt">
+              <?php //the_excerpt() ?>
+              <?php echo wp_trim_words(get_the_excerpt(), 22); // https://developer.wordpress.org/reference/functions/wp_trim_words/?>
+          </section>
+          <?php ; }?>
+
+         <nav class="more-link">
+         <a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>" rel="bookmark" class="button button-more">
+            Més info
+            <span class="hide"><?php the_title(); ?></span>
+           </a>
+         </nav>
+
+</article>
diff --git a/template-parts/section-each-faq.php b/template-parts/section-each-faq.php
new file mode 100644
index 0000000..6117d19
--- /dev/null
+++ b/template-parts/section-each-faq.php
@@ -0,0 +1,37 @@
+<?php
+/**
+ * Template part for displaying posts from category "agenda"
+ *
+ * @link https://developer.wordpress.org/themes/basics/template-hierarchy/
+ *
+ * @package Xarxaprod_theme
+ * @used by template-parts/content-post.php
+ * @shown in : archive category
+ *
+ */
+
+?>
+      <article id="post-<?php the_ID(); ?>" <?php post_class('xarxaprod-card-each'); ?> >
+         <h3 class="entry-title">
+           <a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>" rel="bookmark">
+             <?php the_title(); ?>
+           </a>
+         </h3>
+
+        	<aside class="xarxaprod-faq-info">
+          </aside>
+          <?php if ( get_the_excerpt() ){ ?>
+          <section class="excerpt post-excerpt">
+              <?php //the_excerpt() ?>
+              <?php echo wp_trim_words(get_the_excerpt(), 22); // https://developer.wordpress.org/reference/functions/wp_trim_words/?>
+          </section>
+          <?php ; }?>
+
+         <nav class="more-link">
+         <a href="<?php the_permalink(); ?>" title="<?php the_title(); ?>" rel="bookmark" class="button button-more">
+            Més info
+            <span class="hide"><?php the_title(); ?></span>
+           </a>
+         </nav>
+
+</article>