diff --git a/includes/admin/core/class-admin-enqueue.php b/includes/admin/core/class-admin-enqueue.php
index 786b9920..5ac87d18 100644
--- a/includes/admin/core/class-admin-enqueue.php
+++ b/includes/admin/core/class-admin-enqueue.php
@@ -445,7 +445,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Enqueue' ) ) {
 				return;
 			}
 
-			wp_register_script( 'um-blocks-shortcode-js', $this->js_url . 'um-admin-blocks-shortcode.js', array( 'wp-i18n', 'wp-blocks', 'wp-components' ), ultimatemember_version, true );
+			wp_register_script( 'um-blocks-shortcode-js', $this->js_url . 'um-admin-blocks-shortcode.js', array( 'wp-i18n', 'wp-blocks', 'wp-components', 'rich-text' ), ultimatemember_version, true );
 			wp_set_script_translations( 'um-blocks-shortcode-js', 'ultimate-member' );
 			wp_enqueue_script( 'um-blocks-shortcode-js' );
 
diff --git a/includes/core/class-builtin.php b/includes/core/class-builtin.php
index b7c73ef1..ecab4926 100644
--- a/includes/core/class-builtin.php
+++ b/includes/core/class-builtin.php
@@ -734,15 +734,15 @@ if ( ! class_exists( 'um\core\Builtin' ) ) {
 				),
 
 				'user_url' => array(
-                    'title' => __('Website URL','ultimate-member'),
-                    'metakey' => 'user_url',
-                    'type' => 'url',
-                    'label' => __('Website URL','ultimate-member'),
-                    'required' => 1,
-                    'public' => 1,
-                    'editable' => 1,
-                    'validate' => 'url'
-                ),
+					'title' => __('Website URL','ultimate-member'),
+					'metakey' => 'user_url',
+					'type' => 'url',
+					'label' => __('Website URL','ultimate-member'),
+					'required' => 1,
+					'public' => 1,
+					'editable' => 1,
+					'validate' => 'url'
+				),
 
 				'user_registered' => array(
 					'title' => __('Registration Date','ultimate-member'),
diff --git a/includes/core/um-filters-members.php b/includes/core/um-filters-members.php
index 723f4dd1..ec4aab65 100644
--- a/includes/core/um-filters-members.php
+++ b/includes/core/um-filters-members.php
@@ -451,13 +451,13 @@ add_filter( 'um_prepare_user_query_args', 'um_prepare_user_query_args', 10, 2 );
 function um_sortby_last_login( $query_args, $sortby ) {
 	if ( $sortby == 'last_login' ) {
 		$query_args['orderby'] = array( 'um_last_login' => 'DESC' );
-		$query_args['meta_query']['um_last_login'] = array(
+		$query_args['meta_query'][] = array(
 			'relation' => 'OR',
 			array(
 				'key'   => '_um_last_login',
 				'compare'   => 'EXISTS',
 			),
-			array(
+			'um_last_login' => array(
 				'key'   => '_um_last_login',
 				'compare'   => 'NOT EXISTS',
 			),