diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 1add7b45..b6a23e52 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -942,14 +942,23 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 			}
 
 			$meta_query = array(
-				"relation"  => "OR",
+				'relation'  => 'OR',
 				array(
 					'key'       => 'hide_in_members',
-					'value'     => '',
 					'compare'   => 'NOT EXISTS'
 				),
-				array(
-					"relation"  => "AND",
+			);
+
+
+			if ( __( 'Yes', 'ultimate-member' ) == 'Yes' ) {
+				$meta_query[] = array(
+					'key'       => 'hide_in_members',
+					'value'     => 'Yes',
+					'compare'   => 'NOT LIKE',
+				);
+			} else {
+				$meta_query[] = array(
+					'relation'  => 'AND',
 					array(
 						'key'       => 'hide_in_members',
 						'value'     => __( 'Yes', 'ultimate-member' ),
@@ -960,8 +969,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 						'value'     => 'Yes',
 						'compare'   => 'NOT LIKE'
 					),
-				),
-			);
+				);
+			}
 
 			$this->query_args['meta_query'] = array_merge( $this->query_args['meta_query'], array( $meta_query ) );
 		}
diff --git a/templates/members.php b/templates/members.php
index 6778d0e6..2e2efbc3 100644
--- a/templates/members.php
+++ b/templates/members.php
@@ -189,7 +189,7 @@ if ( ( ( $search && $show_search ) || ( $filters && $show_filters && count( $sea
 
 	<div class="um-member-directory-header um-form">
 
-		<?php do_action( 'um_members_directory_before_head', $args ); ?>
+		<?php do_action( 'um_members_directory_before_head', $args, $form_id ); ?>
 
 		<?php if ( $search && $show_search ) { ?>
 			<div class="um-member-directory-header-row um-member-directory-search-row">