diff --git a/inc/template-functions.php b/inc/template-functions.php
index 04f6705..c674a86 100644
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -112,3 +112,25 @@ if ( ! function_exists( 'ofisuport_display_each_faq_categories' ) ) :
       }                       
   }
 endif; //end ofisuport_display_each_faq_categories
+
+/**
+ * Display search form for FAQs
+ */
+
+if ( ! function_exists( 'ofisuport_display_faq_search' ) ) :
+  function ofisuport_display_faqs_search() {  
+    // search form for category
+    // https://developer.wordpress.org/reference/functions/get_search_form/#comment-369
+    // https://wordpress.stackexchange.com/questions/313037/restrict-a-search-to-a-custom-post-type
+ 
+    echo '<aside id="search-form-faqs" class="search-faqs">';
+    echo'  <form class="search-form" role="search" method="get" action="/">';
+    echo'    <label class="screen-reader-text" for="search">Search in ajuts</label>';
+    echo'    <input type="search" id="search" class="search-field" placeholder="cerca faqs..." value="' . the_search_query() . '" name="s" />';
+    echo'    <input type="submit" id="searchsubmit" class="search-submit button button-search" value="Enviar">';
+    echo'    <input type="hidden" value="posts" name="post_type" id="post_type" />';
+    echo'    <input type="hidden" value="faq" name="category_name" id="category_name" />';
+    echo'  </form>';
+    echo'</aside>';
+  }
+endif; //end ofisuport_display_each_faq_categories
diff --git a/page-templates/faqs-page.php b/page-templates/faqs-page.php
index 6fbe614..284b539 100644
--- a/page-templates/faqs-page.php
+++ b/page-templates/faqs-page.php
@@ -44,6 +44,7 @@ get_header();
 
      <?php //if( in_category('faq') ) : ?>
        <?php ofisuport_display_faqs_labels(); ?>
+       <?php ofisuport_display_faqs_search(); ?>
      <?php //endif; //end if is_category faq ?>
 
       <content class="archive-posts <?php ofisuport_class_posttype(); ?>">
diff --git a/search.php b/search.php
index 2427d44..ca860ef 100644
--- a/search.php
+++ b/search.php
@@ -15,14 +15,45 @@ get_header();
 		<?php if ( have_posts() ) : ?>
 
 			<header class="page-header">
-				<h1 class="page-title">
-					<?php
-					/* translators: %s: search query. */
-					printf( esc_html__( 'Search Results for: %s', 'ofisuport' ), '<span>' . get_search_query() . '</span>' );
-					?>
-				</h1>
 			</header><!-- .page-header -->
 
+<?php 
+// check if is ofisuport-ajut
+if ( get_post_type( get_the_ID() ) == 'ofisuport-ajut'){ ?>
+    <section id="filteredfunds" class="ofisuport-filtered-funds ofisuport-ajuts-filtrats">
+      <aside id="fundsfilter" class="ofisuport-filter-funds ofisuport-fitre-ajuts">
+
+        <script type="text/javascript">
+          <!-- https://stackoverflow.com/a/48314274 -->
+          (function($) {
+          $('.fund-filter').ready(function() {
+            $('.oficinasuport-titol-opcions').click(function() {
+              $(this).siblings(".filter").toggle();
+            });
+          });
+          })(jQuery);
+        </script>
+				<?php ofisuport_ajuts_filters_form(); // function defined in the plugin ?>
+
+      </aside>
+<?php } elseif ( in_category ( 'faq' ) ) { ?>
+		<section id="filteredsearch" class="ofisuport-searched-query ofisuport-search-faqs">
+   
+       <?php //if( in_category('faq') ) : ?>
+         <?php ofisuport_display_faqs_labels(); ?>
+         <?php ofisuport_display_faqs_search(); ?>
+       <?php //endif; //end if is_category faq ?>
+   
+
+<?php } else { ?>
+		<section id="filteredsearch" class="ofisuport-searched-query">
+      <?php
+      /* translators: %s: search query. */
+      printf( esc_html__( 'Search Results for: %s', 'ofisuport' ), '<br/><span class="h5 search-query">' . get_search_query() . '</span>' );
+?>
+<?php }; // end if is ofisuport-ajut ?>
+    <content class="archive-posts <?php ofisuport_class_posttype(); ?>">
+
 			<?php
 			/* Start the Loop */
 			while ( have_posts() ) :
@@ -46,6 +77,8 @@ get_header();
 		endif;
 		?>
 
+		</content>
+   </section>
 	</main><!-- #main -->
 
 <?php
diff --git a/template-parts/content-search.php b/template-parts/content-search.php
index 69b5625..4a9fe7e 100644
--- a/template-parts/content-search.php
+++ b/template-parts/content-search.php
@@ -11,7 +11,7 @@
 
 <article id="post-<?php the_ID(); ?>" <?php post_class(); ?>>
 	<header class="entry-header">
-		<?php the_title( sprintf( '<h2 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h2>' ); ?>
+		<?php the_title( sprintf( '<h3 class="entry-title"><a href="%s" rel="bookmark">', esc_url( get_permalink() ) ), '</a></h3>' ); ?>
 
 		<?php if ( 'post' === get_post_type() ) : ?>
 		<div class="entry-meta">