diff --git a/includes/class-dependencies.php b/includes/class-dependencies.php
index a87cd6c3..c17b880c 100644
--- a/includes/class-dependencies.php
+++ b/includes/class-dependencies.php
@@ -52,7 +52,6 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 			'social-activity'       => '2.0.6',
 			'social-login'          => '2.0.1',
 			'terms-conditions'      => '2.0',
-			'user-location'         => '2.0',
 			'user-tags'             => '2.0',
 			'verified-users'        => '2.0.1',
 			'woocommerce'           => '2.0.1',
@@ -66,6 +65,7 @@ if ( ! class_exists( 'um\Dependencies' ) ) {
 			'user-bookmarks'        => '2.0',
 			'unsplash'              => '2.0',
 			'forumwp'               => '2.0.1',
+			'user-location'         => '1.0',
 		);
 
 
diff --git a/includes/class-init.php b/includes/class-init.php
index c1076320..ddf6e7eb 100644
--- a/includes/class-init.php
+++ b/includes/class-init.php
@@ -29,7 +29,7 @@ if ( ! class_exists( 'UM' ) ) {
 	 * @method UM_WooCommerce_API WooCommerce_API()
 	 * @method UM_Terms_Conditions Terms_Conditions()
 	 * @method UM_Private_Content_API Private_Content_API()
-	 * @method UM_User_Location_API User_Location_API()
+	 * @method UM_User_Location User_Location()
 	 * @method UM_Photos_API Photos_API()
 	 * @method UM_Groups Groups()
 	 * @method UM_Frontend_Posting Frontend_Posting()
diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 8c053aba..f9dea0ad 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -1197,7 +1197,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 
 					// Add OR instead AND to search in WP core fields user_email, user_login, user_display_name
 					$search_where = $context->get_search_sql( $search, UM()->member_directory()->core_search_fields, 'both' );
-					$search_where = preg_replace( '/ AND \((.*?)\)/im', " OR $1", $search_where );
+					$search_where = preg_replace( '/ AND \((.*?)\)/im', " AND ( $1 )", $search_where );
 
 					$sql['where'] = $sql['where'] . $search_where;
 				}
diff --git a/includes/core/class-plugin-updater.php b/includes/core/class-plugin-updater.php
index 0523ba85..8e6c5e56 100644
--- a/includes/core/class-plugin-updater.php
+++ b/includes/core/class-plugin-updater.php
@@ -139,6 +139,10 @@ if ( ! class_exists( 'um\core\Plugin_Updater' ) ) {
 					'key'   => 'filesharing',
 					'title' => 'File Sharing',
 				),
+				'um-user-location/um-user-location.php'                     => array(
+					'key'   => 'user-location',
+					'title' => 'User Location',
+				),
 			);
 
 			$active_um_plugins = array();