diff --git a/inc/template-hook-functions.php b/inc/template-hook-functions.php
index 56bf6d48..fd938f55 100755
--- a/inc/template-hook-functions.php
+++ b/inc/template-hook-functions.php
@@ -28,7 +28,7 @@ function opalestate_single_property_layout_default() {
 	//  add_action( 'opalestate_after_single_property_summary', '', 55 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
 
-	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+	if ( opalestate_property_reviews_enabled() ) {
 		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
 	}
 
@@ -75,7 +75,7 @@ function opalestate_single_property_layout_v2() {
 
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
 
-	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+	if ( opalestate_property_reviews_enabled() ) {
 		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
 	}
 
@@ -116,7 +116,7 @@ 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 );
 
-	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+	if ( opalestate_property_reviews_enabled() ) {
 		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
 	}
 
@@ -152,7 +152,7 @@ function opalestate_single_property_layout_v4() {
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_views_statistics', 50 );
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
 
-	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+	if ( opalestate_property_reviews_enabled() ) {
 		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
 	}
 
@@ -191,7 +191,7 @@ function opalestate_single_property_layout_v5() {
 
 	add_action( 'opalestate_after_single_property_summary', 'opalestate_property_tags', 60 );
 
-	if ( opalestate_get_option( 'enable_property_reviews' ) ) {
+	if ( opalestate_property_reviews_enabled() ) {
 		add_action( 'opalestate_after_single_property_summary', 'comments_template', 65 );
 	}
 
diff --git a/templates/content-single-agency.php b/templates/content-single-agency.php
index 1a129ddc..25a97dbc 100755
--- a/templates/content-single-agency.php
+++ b/templates/content-single-agency.php
@@ -119,7 +119,7 @@ $id      = time();
             </div>
 
 			<?php
-			if ( opalestate_get_option( 'enable_agency_reviews' ) ) {
+			if ( opalestate_agency_reviews_enabled() ) {
 				comments_template();
 			}
 			?>
diff --git a/templates/content-single-agent.php b/templates/content-single-agent.php
index 99fc6538..7b0fe4c9 100755
--- a/templates/content-single-agent.php
+++ b/templates/content-single-agent.php
@@ -106,7 +106,7 @@ $id      = time();
                 </div><!-- .entry-content -->
 
 				<?php
-				if ( opalestate_get_option( 'enable_agent_reviews' ) ) {
+				if ( opalestate_agent_reviews_enabled() ) {
 					comments_template();
 				}
 				?>
diff --git a/templates/single-property/amenities.php b/templates/single-property/amenities.php
index a8e28379..7bd74d96 100755
--- a/templates/single-property/amenities.php
+++ b/templates/single-property/amenities.php
@@ -4,7 +4,7 @@ global $property, $post;
 $amenities = $property->get_amenities();
 
 ?>
-<?php if ( $property->get_block_setting( 'amenities' ) && $amenities ): ?>
+<?php if ( 'on' === $property->get_block_setting( 'amenities' ) && $amenities ): ?>
     <div class="property-amenities box-inner-summary">
         <h5 class="list-group-item-heading"><?php esc_html_e( 'Amenities', 'opalestate-pro' ); ?></h5>
         <div class="list-group-item-text">
diff --git a/templates/single-property/apartments.php b/templates/single-property/apartments.php
index 6fa46331..ccd75e7a 100755
--- a/templates/single-property/apartments.php
+++ b/templates/single-property/apartments.php
@@ -1,6 +1,6 @@
 <?php
 global $property;
-if ( ! $property->get_block_setting( 'apartments' ) ) {
+if ( 'on' !== $property->get_block_setting( 'apartments' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/attachments.php b/templates/single-property/attachments.php
index f90784e5..bff067ed 100755
--- a/templates/single-property/attachments.php
+++ b/templates/single-property/attachments.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'attachments' ) ) {
+if ( 'on' !== $property->get_block_setting( 'attachments' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/facilities.php b/templates/single-property/facilities.php
index 8fa1d5ab..cf5a65d2 100755
--- a/templates/single-property/facilities.php
+++ b/templates/single-property/facilities.php
@@ -5,7 +5,7 @@ $facilities = $property->get_facilities();
 
 ?>
 
-<?php if ( $property->get_block_setting( 'facilities' ) && $facilities && isset( $facilities[0] ) && ! empty( $facilities[0] ) ): ?>
+<?php if ( 'on' === $property->get_block_setting( 'facilities' ) && $facilities && isset( $facilities[0] ) && ! empty( $facilities[0] ) ): ?>
     <div class="property-facilities box-inner-summary">
         <h5 class="list-group-item-heading"><?php esc_html_e( "Facilities", "opalestate" ); ?></h5>
         <div class="list-group-item-text">
diff --git a/templates/single-property/features.php b/templates/single-property/features.php
deleted file mode 100755
index aede7b7e..00000000
--- a/templates/single-property/features.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-global $property;
-$infos = $property->get_metabox_info();
-
-$types  = $property->get_types();
-$status = $property->get_status();
-
-?>
-ha cong
-<div class="box-info">
-    <h3 class="box-heading"><?php esc_html_e( 'Property Information', 'opalestate-pro' ); ?></h3>
-    <div class="box-content">
-        <ul class="list-info">
-			<?php if ( $infos ): ?>
-
-				<?php foreach ( $infos as $key => $info ) : ?>
-					<?php if ( $info['value'] ) : ?>
-                        <li class="icon-<?php echo esc_attr( $key ); ?>"><span><?php echo esc_html( $info['label'] ); ?></span> <?php echo apply_filters( 'opalestate-pro' . $key . '_unit_format',
-								trim( $info['value'] )
-							); ?></li>
-					<?php endif; ?>
-				<?php endforeach; ?>
-
-			<?php endif; ?>
-			<?php if ( ! empty( $types ) ): ?>
-                <li class="icon-type">
-					<span>
-						<?php esc_html_e( 'Type', 'opalestate-pro' ); ?>
-					</span>
-					<?php foreach ( $types as $type ) : ?>
-                        <a href="<?php echo esc_url( get_term_link( $type ) ); ?>" title="<?php echo esc_attr( $type->name ); ?>">
-							<?php echo esc_html( $type->name ); ?>
-                        </a>
-					<?php endforeach; ?>
-                </li>
-			<?php endif; ?>
-			<?php if ( ! empty( $status ) ): ?>
-                <li class="icon-status">
-					<span>
-						<?php esc_html_e( 'Status', 'opalestate-pro' ); ?>
-					</span>
-					<?php foreach ( $status as $type ) : ?>
-                        <a href="<?php echo esc_url( get_term_link( $type ) ); ?>" title="<?php echo esc_attr( $type->name ); ?>">
-							<?php echo esc_html( $type->name ); ?>
-                        </a>
-					<?php endforeach; ?>
-                </li>
-			<?php endif; ?>
-        </ul>
-    </div>
-</div>		
diff --git a/templates/single-property/floor-plans.php b/templates/single-property/floor-plans.php
index 3eade2e9..2a58eb5e 100755
--- a/templates/single-property/floor-plans.php
+++ b/templates/single-property/floor-plans.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'floor_plans' ) ) {
+if ( 'on' !== $property->get_block_setting( 'floor_plans' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/map-v2.php b/templates/single-property/map-v2.php
index 83f3a7fe..55df924b 100755
--- a/templates/single-property/map-v2.php
+++ b/templates/single-property/map-v2.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'map' ) ) {
+if ( 'on' !== $property->get_block_setting( 'map' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/map.php b/templates/single-property/map.php
index 32ee32b7..e3a11915 100755
--- a/templates/single-property/map.php
+++ b/templates/single-property/map.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'map' ) ) {
+if ( 'on' !== $property->get_block_setting( 'map' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/nearby.php b/templates/single-property/nearby.php
index 863b7aa2..c7872bff 100755
--- a/templates/single-property/nearby.php
+++ b/templates/single-property/nearby.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'nearby' ) ) {
+if ( 'on' !== $property->get_block_setting( 'nearby' ) ) {
 	return;
 }
 
@@ -50,4 +50,4 @@ if ( ! $latitude || ! $longitude ) {
             </script>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>
diff --git a/templates/single-property/video.php b/templates/single-property/video.php
index caa569ef..4c86d188 100755
--- a/templates/single-property/video.php
+++ b/templates/single-property/video.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'video' ) ) {
+if ( 'on' !== $property->get_block_setting( 'video' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/views-statistics.php b/templates/single-property/views-statistics.php
index 734e9c98..a04898a5 100755
--- a/templates/single-property/views-statistics.php
+++ b/templates/single-property/views-statistics.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'views_statistics' ) ) {
+if ( 'on' !== $property->get_block_setting( 'views_statistics' ) ) {
     return;
 }
 
diff --git a/templates/single-property/virtualtour.php b/templates/single-property/virtualtour.php
index 6bd7c199..d6cc71da 100755
--- a/templates/single-property/virtualtour.php
+++ b/templates/single-property/virtualtour.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'virtual_tour' ) ) {
+if ( 'on' !== $property->get_block_setting( 'virtual_tour' ) ) {
 	return;
 }
 
diff --git a/templates/single-property/walkscore.php b/templates/single-property/walkscore.php
index 1b9293e9..e5993863 100755
--- a/templates/single-property/walkscore.php
+++ b/templates/single-property/walkscore.php
@@ -1,7 +1,7 @@
 <?php
 global $property;
 
-if ( ! $property->get_block_setting( 'walkscores' ) ) {
+if ( 'on' !== $property->get_block_setting( 'walkscores' ) ) {
 	return;
 }