diff --git a/templates/elementor-templates/opalestate-agency-collection.php b/templates/elementor-templates/opalestate-agency-collection.php
index 2ccea4a5..4ae9b95a 100755
--- a/templates/elementor-templates/opalestate-agency-collection.php
+++ b/templates/elementor-templates/opalestate-agency-collection.php
@@ -1,59 +1,62 @@
-	<?php
-	$settings = $this->get_settings_for_display();
- 	$layout =  $settings['item_layout']; 
- 	$attrs = $this->get_render_attribute_string( 'wrapper-style' ); 
- 	if( isset($_GET['display']) && $_GET['display'] == 'grid' ){ 
- 		$layout  = 'grid';
+<?php
+$settings = $this->get_settings_for_display();
+$layout   = $settings['item_layout'];
+$attrs    = $this->get_render_attribute_string( 'wrapper-style' );
+if ( isset( $_GET['display'] ) && $_GET['display'] == 'grid' ) {
+	$layout = 'grid';
 
- 	}else if(  isset($_GET['display']) && $_GET['display'] == 'list' ){
- 		$layout  = 'list'; 
- 		 $attrs = 'class="column-list"';
- 	}
- 	$onlyfeatured = 0; 
-	if( isset($_GET['s_agents']) ) {
-		$query = Opalestate_Agency_Query::get_agencies( array("posts_per_page"=>$limit, 'paged' => $paged), $onlyfeatured );
-	} else {
-		$query = Opalestate_Agency_Query::get_search_agencies_query(); 
-	}
- 
-	$rowcls = apply_filters('opalestate_row_container_class', 'opal-row'); 
+} elseif ( isset( $_GET['display'] ) && $_GET['display'] == 'list' ) {
+	$layout = 'list';
+	$attrs  = 'class="column-list"';
+}
+$onlyfeatured = 0;
+if ( isset( $_GET['s_agents'] ) ) {
+	$query = Opalestate_Agency_Query::get_agencies( [ "posts_per_page" => $limit, 'paged' => $paged ], $onlyfeatured );
+} else {
+	$query = Opalestate_Agency_Query::get_search_agencies_query();
+}
+
+$rowcls = apply_filters( 'opalestate_row_container_class', 'opal-row' );
 ?>
- 
- <?php if( $settings['enable_sortable_bar'] ): ?>
-<div class="opalesate-archive-top"><div class="<?php echo $rowcls;?>">
-	<div class="col-lg-6 col-md-6 col-sm-6">
-		<div class="collection-counter">
-			<span><?php echo sprintf( esc_html__('Found %s Agency', 'opalestate-pro'),  '<span class="text-primary">'.$query->found_posts.'</span>' ) ?></span>
-		</div>	
-	</div>
-	<div class="col-lg-6 col-md-6 col-sm-6  text-right">
-		 <div class="opalestate-sortable">
-			<?php echo opalestate_render_sortable_dropdown(); ?>
-		</div>
-		<?php opalestate_show_display_modes(); ?>	
-	</div>
-</div></div>	
+
+<?php if ( $settings['enable_sortable_bar'] ): ?>
+    <div class="opalesate-archive-top">
+        <div class="<?php echo esc_attr( $rowcls ); ?>">
+            <div class="col-lg-6 col-md-6 col-sm-6">
+                <div class="collection-counter">
+                    <span><?php echo sprintf( esc_html__( 'Found %s Agency', 'opalestate-pro' ), '<span class="text-primary">' . $query->found_posts . '</span>' ) ?></span>
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-sm-6  text-right">
+                <div class="opalestate-sortable">
+					<?php echo opalestate_render_sortable_dropdown(); ?>
+                </div>
+				<?php opalestate_show_display_modes(); ?>
+            </div>
+        </div>
+    </div>
 <?php endif; ?>
 <div class="agency-collection-wrap">
-	<?php if( $query->have_posts() ): ?>
-	<div class="agency-container">
-			<div <?php echo $attrs; ?>>
-				<?php $cnt=0; while( $query->have_posts() ):  $query->the_post();  ?>
-					<div class="column-item ">
-						<?php echo opalestate_load_template_path( 'content-agency-'.$layout ); ?>
-					</div>
+	<?php if ( $query->have_posts() ): ?>
+        <div class="agency-container">
+            <div <?php echo wp_kses_post( $attrs ); ?>>
+				<?php $cnt = 0;
+				while ( $query->have_posts() ): $query->the_post(); ?>
+                    <div class="column-item ">
+						<?php echo opalestate_load_template_path( 'content-agency-' . $layout ); ?>
+                    </div>
 				<?php endwhile; ?>
-			</div>
-		</div>
-		<?php if( $query->max_num_pages ): ?>
-		<div class="w-pagination">
-			<?php opalestate_pagination( $query->max_num_pages ); ?>
-		</div>
-		<?php endif;  ?>
+            </div>
+        </div>
+		<?php if ( $query->max_num_pages ): ?>
+            <div class="w-pagination">
+				<?php opalestate_pagination( $query->max_num_pages ); ?>
+            </div>
+		<?php endif; ?>
 	<?php else: ?>
-	<div class="agency-results">
-		<?php echo opalestate_load_template_path( 'content-no-results' ); ?>
-	</div>
+        <div class="agency-results">
+			<?php echo opalestate_load_template_path( 'content-no-results' ); ?>
+        </div>
 	<?php endif; ?>
 </div>
 <?php wp_reset_postdata(); ?>
diff --git a/templates/elementor-templates/opalestate-agent-collection.php b/templates/elementor-templates/opalestate-agent-collection.php
index 4ff77659..d089ea11 100755
--- a/templates/elementor-templates/opalestate-agent-collection.php
+++ b/templates/elementor-templates/opalestate-agent-collection.php
@@ -1,62 +1,65 @@
-	<?php
-	$settings = $this->get_settings_for_display();
- 	$layout =  $settings['item_layout']; 
- 	$attrs = $this->get_render_attribute_string( 'wrapper-style' ); 
- 	if( isset($_GET['display']) && $_GET['display'] == 'grid' ){ 
- 		$layout  = 'grid';
+<?php
+$settings = $this->get_settings_for_display();
+$layout   = $settings['item_layout'];
+$attrs    = $this->get_render_attribute_string( 'wrapper-style' );
+if ( isset( $_GET['display'] ) && $_GET['display'] == 'grid' ) {
+	$layout = 'grid';
 
- 	}else if( isset($_GET['display']) && $_GET['display'] == 'list' ){
- 		$layout  = 'list'; 
- 		 $attrs = 'class="column-list"';
- 	}
- 	
- 	$onlyfeatured = 0 ;
+} elseif ( isset( $_GET['display'] ) && $_GET['display'] == 'list' ) {
+	$layout = 'list';
+	$attrs  = 'class="column-list"';
+}
 
-	if( isset($_GET['s_agents']) ) {
-		$query = Opalestate_Query::get_agents( array("posts_per_page"=>$limit, 'paged' => $paged), $onlyfeatured );
-	} else {
-		$query = OpalEstate_Search::get_search_agents_query(); 
-	}
+$onlyfeatured = 0;
 
-	$form = $settings['search_form'] ? "search-agents-form-".$settings['search_form']: "search-agents-form";
-	$rowcls = apply_filters('opalestate_row_container_class', 'opal-row'); 
+if ( isset( $_GET['s_agents'] ) ) {
+	$query = Opalestate_Query::get_agents( [ "posts_per_page" => $limit, 'paged' => $paged ], $onlyfeatured );
+} else {
+	$query = OpalEstate_Search::get_search_agents_query();
+}
+
+$form   = $settings['search_form'] ? "search-agents-form-" . $settings['search_form'] : "search-agents-form";
+$rowcls = apply_filters( 'opalestate_row_container_class', 'opal-row' );
 ?>
- 
- <?php if( $settings['enable_sortable_bar'] ): ?>
-<div class="opalesate-archive-top"><div class="<?php echo esc_attr( $rowcls ); ?>">
-	<div class="col-lg-6 col-md-6 col-sm-6">
-		<div class="collection-counter">
-			<span><?php echo sprintf( esc_html__('Found %s Agents', 'opalestate-pro'),  '<span class="text-primary">'.$query->found_posts.'</span>' ) ?></span>
-		</div>	
-	</div>
-	<div class="col-lg-6 col-md-6 col-sm-6  text-right">
-		 <div class="opalestate-sortable">
-			<?php echo opalestate_render_sortable_dropdown(); ?>
-		</div>	
-		<?php opalestate_show_display_modes(); ?>
-	</div>
-</div></div>	
+
+<?php if ( $settings['enable_sortable_bar'] ): ?>
+    <div class="opalesate-archive-top">
+        <div class="<?php echo esc_attr( $rowcls ); ?>">
+            <div class="col-lg-6 col-md-6 col-sm-6">
+                <div class="collection-counter">
+                    <span><?php echo sprintf( esc_html__( 'Found %s Agents', 'opalestate-pro' ), '<span class="text-primary">' . $query->found_posts . '</span>' ) ?></span>
+                </div>
+            </div>
+            <div class="col-lg-6 col-md-6 col-sm-6  text-right">
+                <div class="opalestate-sortable">
+					<?php echo opalestate_render_sortable_dropdown(); ?>
+                </div>
+				<?php opalestate_show_display_modes(); ?>
+            </div>
+        </div>
+    </div>
 <?php endif; ?>
 <div class="agents-collection-wrap">
-	<?php if( $query->have_posts() ): ?>
-		<div class="agents-container">
-			<div <?php echo $attrs; ?>>
-				<?php $cnt=0; while( $query->have_posts() ):  $query->the_post();  ?>
-					<div class="column-item ">
-						<?php echo opalestate_load_template_path( 'content-agent-'.$layout ); ?>
-					</div>
+	<?php if ( $query->have_posts() ): ?>
+        <div class="agents-container">
+            <div <?php echo $attrs; ?>>
+				<?php $cnt = 0;
+				while ( $query->have_posts() ): $query->the_post(); ?>
+                    <div class="column-item ">
+						<?php echo opalestate_load_template_path( 'content-agent-' . $layout ); ?>
+                    </div>
 				<?php endwhile; ?>
-			</div>
-		</div>
-		<?php if( $query->max_num_pages ): ?>
-		<div class="w-pagination">
-			<?php opalestate_pagination( $query->max_num_pages ); ?>
-		</div>
-		<?php endif;  ?>
+            </div>
+        </div>
+		<?php if ( $query->max_num_pages ): ?>
+            <div class="w-pagination">
+				<?php opalestate_pagination( $query->max_num_pages ); ?>
+            </div>
+		<?php endif; ?>
 	<?php else: ?>
-	<div class="agents-results">
-		<?php echo opalestate_load_template_path( 'content-no-results' ); ?>
-	</div>
+        <div class="agents-results">
+			<?php echo opalestate_load_template_path( 'content-no-results' ); ?>
+        </div>
 	<?php endif; ?>
 </div>
 <?php wp_reset_postdata(); ?>
diff --git a/templates/elementor-templates/opalestate-category-list.php b/templates/elementor-templates/opalestate-category-list.php
index d1830f92..70585327 100755
--- a/templates/elementor-templates/opalestate-category-list.php
+++ b/templates/elementor-templates/opalestate-category-list.php
@@ -15,7 +15,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
 
 ?>
 <div class="category-list-collection ">
-    <div <?php echo $attrs; ?>>
+    <div <?php echo wp_kses_post( $attrs ); ?>>
 		<?php foreach ( $terms as $category ): ?>
 			<?php
 			$tax_link = get_term_link( $category->term_id );
@@ -32,7 +32,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
                 }
 				?>
 
-                <div class="property-category-bg" <?php echo $style; ?>>
+                <div class="property-category-bg" <?php echo wp_kses_post( $style ); ?>>
                 </div>
                 <div class="static-content">
                     <div class="property-category-info text-center">
@@ -51,6 +51,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
 										'%1$s Property',
 										'%1$s Properties',
 										$category->count,
+										'count properties',
 										'opalestate-pro'
 									),
 									number_format_i18n( $category->count )
diff --git a/templates/elementor-templates/opalestate-city-list.php b/templates/elementor-templates/opalestate-city-list.php
index 07d38e6f..592a6efa 100755
--- a/templates/elementor-templates/opalestate-city-list.php
+++ b/templates/elementor-templates/opalestate-city-list.php
@@ -15,7 +15,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
 
 ?>
 <div class="city-list-collection ">
-    <div <?php echo $attrs; ?>>
+    <div <?php echo wp_kses_post( $attrs ); ?>>
 		<?php foreach ( $terms as $city ): ?>
 			<?php
 			$tax_link = get_term_link( $city->term_id );
@@ -32,7 +32,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
                 }
 				?>
 
-                <div class="property-city-bg" <?php echo $style; ?>>
+                <div class="property-city-bg" <?php echo wp_kses_post( $style ); ?>>
                 </div>
                 <div class="static-content">
                     <div class="property-city-info text-center">
@@ -51,6 +51,7 @@ $attrs = $this->get_render_attribute_string( 'wrapper-style' );
 										'%1$s Property',
 										'%1$s Properties',
 										$city->count,
+										'count properties',
 										'opalestate-pro'
 									),
 									number_format_i18n( $city->count )