diff --git a/inc/property/class-opalestate-property.php b/inc/property/class-opalestate-property.php
index 2afbf4f7..5914dd3f 100755
--- a/inc/property/class-opalestate-property.php
+++ b/inc/property/class-opalestate-property.php
@@ -190,7 +190,7 @@ class Opalestate_Property {
 					$value = get_post_meta( $this->post_id, $field['id'], true );
 				}
 
-				$value = isset( $field['unit'] ) ? $value . ' ' . $field['unit'] : $value;
+				$value = isset( $field['unit'] ) && $field['unit'] ? $value . ' ' . $field['unit'] : $value;
 
 				$this->metabox_info[ $id ] = [ 'label' => $field['name'], 'value' => $value ];
 			}
diff --git a/inc/template-hook-functions.php b/inc/template-hook-functions.php
index 446684dc..7bbb38ff 100755
--- a/inc/template-hook-functions.php
+++ b/inc/template-hook-functions.php
@@ -27,7 +27,11 @@ function opalestate_single_property_layout_default() {
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_views_statistics', 50 );
 	//  add_action( 'opalestate_after_single_property_summary', '', 55 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
-	add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+
+	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+	}
+
 	add_action( 'opalestate_after_single_property_summary_v2', 'opalestate_property_map_v2', 5 );
 
 	////// sidebar ////////
@@ -70,7 +74,11 @@ function opalestate_single_property_layout_v2() {
 	//  add_action( 'opalestate_after_single_property_summary', 'opalestate_property_author', 55 );
 
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
-	add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+
+	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+	}
+
 	add_action( 'opalestate_after_single_property_summary_v2', 'opalestate_property_map_v2', 5 );
 
 
@@ -107,7 +115,11 @@ function opalestate_single_property_layout_v3() {
 
 	//    add_action( 'opalestate_after_single_property_summary', 'opalestate_property_author', 55 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
-	add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+
+	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+	}
+
 	add_action( 'opalestate_after_single_property_summary_v2', 'opalestate_property_map_v2', 5 );
 
 	add_action( 'opalestate_single_property_sidebar', 'opalestate_property_author_v2', 5 );
@@ -129,7 +141,6 @@ function opalestate_single_property_layout_v4() {
 	add_action( 'opalestate_single_property_summary', 'opalestate_property_facilities', 17 );
 	add_action( 'opalestate_single_property_summary', 'opalestate_property_attachments', 18 );
 
-
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_video', 20 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_virtual_tour', 25 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_map', 30 );
@@ -139,9 +150,12 @@ function opalestate_single_property_layout_v4() {
 
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_apartments', 45 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_views_statistics', 50 );
-	//    add_action( 'opalestate_after_single_property_summary', 'opalestate_property_author', 55 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
-	add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+
+	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+	}
+
 	add_action( 'opalestate_after_single_property_summary_v2', 'opalestate_property_map_v2', 5 );
 
 	add_action( 'opalestate_single_property_sidebar', 'opalestate_property_author_v2', 5 );
@@ -176,7 +190,11 @@ function opalestate_single_property_layout_v5() {
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_views_statistics', 50 );
 
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
-	add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+
+	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
+	}
+
 	add_action( 'opalestate_after_single_property_summary_v2', 'opalestate_property_map_v2', 5 );
 
 	add_filter( 'opalestate_thumbnail_nav_column', function () {
@@ -229,6 +247,7 @@ function opalestate_single_property_layout( $layout ) {
 			break;
 	}
 }
+
 add_action( 'opalestate_single_property_layout', 'opalestate_single_property_layout' );
 
 /**
diff --git a/templates/content-single-agency.php b/templates/content-single-agency.php
index b8c3fab2..cb64508c 100755
--- a/templates/content-single-agency.php
+++ b/templates/content-single-agency.php
@@ -99,7 +99,7 @@ $id      = time();
                             <div class="opalestate-tab-content" id="tab-content-team">
                                 <div class="opalestate-box-content">
                                     <h4 class="outbox-title"><?php esc_html_e( 'Team', 'opalestate-pro' ); ?></h4>
-                                    <?php echo $team; ?>
+									<?php echo $team; ?>
                                 </div>
                             </div>
 						<?php endif; ?>
@@ -109,7 +109,7 @@ $id      = time();
                                 <div class="opalestate-box-content">
                                     <h4 class="outbox-title"><?php esc_html_e( 'Properties', 'opalestate-pro' ); ?></h4>
                                     <div class="opalestate-box">
-										<?php echo $properties; ?>
+										<?php echo opalestate_load_template_path( 'single-agency/properties' ); ?>
                                     </div>
                                 </div>
                             </div>
@@ -118,7 +118,11 @@ $id      = time();
                 </div>
             </div>
 
-			<?php comments_template(); ?>
+			<?php
+			if ( opalestate_get_option( 'enable_agency_reviews' ) ) {
+				comments_template();
+			}
+			?>
 
             <div class="content-bottom">
 				<?php do_action( 'opalestate_single_agency_content_bottom' ); ?>
diff --git a/templates/content-single-agent.php b/templates/content-single-agent.php
index de91594d..095b0650 100755
--- a/templates/content-single-agent.php
+++ b/templates/content-single-agent.php
@@ -14,7 +14,11 @@ $id      = time();
                 <div class="col-md-8 col-sm-12">
                     <ul class="list-inline opalestate-scroll-elements">
                         <li><a href="#block-description" class="active"><?php esc_html_e( 'Description', 'opalestate-pro' ); ?></a></li>
-                        <li><a href="#reviews"><?php esc_html_e( 'Review', 'opalestate-pro' ); ?></a></li>
+
+						<?php if ( opalestate_get_option( 'enable_agent_reviews' ) ) : ?>
+                            <li><a href="#reviews"><?php esc_html_e( 'Review', 'opalestate-pro' ); ?></a></li>
+						<?php endif; ?>
+
                         <li><a href="#block-my-properties"><?php esc_html_e( 'Properties', 'opalestate-pro' ); ?></a></li>
                     </ul>
                 </div>
@@ -101,7 +105,11 @@ $id      = time();
 					<?php endif ?>
                 </div><!-- .entry-content -->
 
-				<?php comments_template(); ?>
+				<?php
+				if ( opalestate_get_option( 'enable_agent_reviews' ) ) {
+					comments_template();
+				}
+				?>
 
                 <meta itemprop="url" content="<?php the_permalink(); ?>"/>