diff --git a/includes/admin/assets/js/um-admin-forms.js b/includes/admin/assets/js/um-admin-forms.js
index 7309f39a..6c5d102e 100644
--- a/includes/admin/assets/js/um-admin-forms.js
+++ b/includes/admin/assets/js/um-admin-forms.js
@@ -23,7 +23,7 @@ jQuery(document).ready( function() {
 
 		if ( field_key === 'sync_metatable' ) {
 			var metadata_pages = 0;
-			var metadata_per_page = 50;
+			var metadata_per_page = 250;
 			var current_page;
 
 			jQuery.ajax({
diff --git a/includes/admin/core/class-admin-settings.php b/includes/admin/core/class-admin-settings.php
index dea27531..b5828c3f 100644
--- a/includes/admin/core/class-admin-settings.php
+++ b/includes/admin/core/class-admin-settings.php
@@ -187,7 +187,7 @@ if ( ! class_exists( 'um\admin\core\Admin_Settings' ) ) {
 					wp_send_json_error( __( 'Wrong data', 'ultimate-member' ) );
 				}
 
-				$per_page = 50;
+				$per_page = 250;
 				$wp_usermeta_option = get_option( 'um_usermeta_fields', array() );
 
 				global $wpdb;
diff --git a/includes/core/class-member-directory.php b/includes/core/class-member-directory.php
index 89621548..34a4ed3f 100644
--- a/includes/core/class-member-directory.php
+++ b/includes/core/class-member-directory.php
@@ -504,8 +504,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 				case 'text': {
 					$filter_from_url = ! empty( $_GET[ 'filter_' . $filter . '_' . $unique_hash ] ) ? $_GET[ 'filter_' . $filter . '_' . $unique_hash ] : $default_value; ?>
 						<input type="text" autocomplete="off" id="<?php echo $filter; ?>" name="<?php echo $filter; ?>"
-						       placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
-						       value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field" />
+							   placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
+							   value="<?php echo esc_attr( $filter_from_url ) ?>" class="um-form-field" />
 					<?php
 					break;
 				}
@@ -523,7 +523,7 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 								"SELECT DISTINCT meta_value 
 								FROM $wpdb->usermeta 
 								WHERE meta_key = %s AND 
-								      meta_value != ''",
+									  meta_value != ''",
 								$attrs['metakey']
 							)
 						);
@@ -626,8 +626,8 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 					$attrs['options'] = apply_filters( 'um_member_directory_filter_select_options_sorted', $attrs['options'], $attrs ); ?>
 
 					<select class="um-s1" id="<?php echo esc_attr( $filter ); ?>" name="<?php echo esc_attr( $filter ); ?><?php if ( $admin && count( $attrs['options'] ) > 1 ) { ?>[]<?php } ?>"
-					        data-placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
-					        <?php if ( $admin && count( $attrs['options'] ) > 1 ) { ?>multiple<?php } ?>
+							data-placeholder="<?php esc_attr_e( stripslashes( $attrs['label'] ), 'ultimate-member' ); ?>"
+							<?php if ( $admin && count( $attrs['options'] ) > 1 ) { ?>multiple<?php } ?>
 						<?php echo $custom_dropdown; ?>>
 
 						<option></option>
@@ -692,15 +692,15 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 					if ( $range ) { ?>
 
 						<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-datepicker-filter"
-						       placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
-						       data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
-						       data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
-						       data-filter_name="<?php echo $filter; ?>" data-range="from" data-value="<?php echo ! empty( $default_value ) ? esc_attr( strtotime( min( $default_value ) ) ) : '' ?>" />
+							   placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
+							   data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
+							   data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
+							   data-filter_name="<?php echo $filter; ?>" data-range="from" data-value="<?php echo ! empty( $default_value ) ? esc_attr( strtotime( min( $default_value ) ) ) : '' ?>" />
 						<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-datepicker-filter"
-						       placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
-						       data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
-						       data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
-						       data-filter_name="<?php echo $filter; ?>" data-range="to" data-value="<?php echo ! empty( $default_value ) ? esc_attr( strtotime( max( $default_value ) ) ) : '' ?>" />
+							   placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
+							   data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
+							   data-date_min="<?php echo $range[0] ?>" data-date_max="<?php echo $range[1] ?>"
+							   data-filter_name="<?php echo $filter; ?>" data-range="to" data-value="<?php echo ! empty( $default_value ) ? esc_attr( strtotime( max( $default_value ) ) ) : '' ?>" />
 
 					<?php }
 
@@ -727,17 +727,17 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 					if ( $range ) { ?>
 
 						<input type="text" id="<?php echo $filter; ?>_from" name="<?php echo $filter; ?>_from" class="um-timepicker-filter"
-						       placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
-						       data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
-						       data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
-						       data-format="<?php echo esc_attr( $js_format ) ?>" data-intervals="<?php echo esc_attr( $attrs['intervals'] ) ?>"
-						       data-filter_name="<?php echo $filter; ?>" data-range="from" />
+							   placeholder="<?php esc_attr_e( sprintf( '%s From', stripslashes( $label ) ), 'ultimate-member' ); ?>"
+							   data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
+							   data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
+							   data-format="<?php echo esc_attr( $js_format ) ?>" data-intervals="<?php echo esc_attr( $attrs['intervals'] ) ?>"
+							   data-filter_name="<?php echo $filter; ?>" data-range="from" />
 						<input type="text" id="<?php echo $filter; ?>_to" name="<?php echo $filter; ?>_to" class="um-timepicker-filter"
-						       placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
-						       data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
-						       data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
-						       data-format="<?php echo esc_attr( $js_format ) ?>" data-intervals="<?php echo esc_attr( $attrs['intervals'] ) ?>"
-						       data-filter_name="<?php echo $filter; ?>" data-range="to" />
+							   placeholder="<?php esc_attr_e( sprintf( '%s To', stripslashes( $label ) ), 'ultimate-member' ); ?>"
+							   data-filter-label="<?php echo esc_attr( stripslashes( $label ) ); ?>"
+							   data-min="<?php echo $range[0] ?>" data-max="<?php echo $range[1] ?>"
+							   data-format="<?php echo esc_attr( $js_format ) ?>" data-intervals="<?php echo esc_attr( $attrs['intervals'] ) ?>"
+							   data-filter_name="<?php echo $filter; ?>" data-range="to" />
 
 					<?php }
 
@@ -763,15 +763,18 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 				default: {
 
 					global $wpdb;
-					$meta = $wpdb->get_col( $wpdb->prepare( "SELECT DISTINCT meta_value
-						FROM {$wpdb->usermeta}
-						WHERE meta_key = %s
-						ORDER BY meta_value DESC", $filter ) );
+					$meta = $wpdb->get_row( $wpdb->prepare(
+						"SELECT MIN( meta_value ) as min_meta, 
+						MAX( meta_value ) as max_meta, 
+						COUNT( DISTINCT meta_value ) as amount 
+						FROM {$wpdb->usermeta} 
+						WHERE meta_key = %s",
+						$filter
+					), ARRAY_A );
 
-					if ( empty( $meta ) || count( $meta ) === 1 ) {
-						$range = false;
-					} elseif ( ! empty( $meta ) ) {
-						$range = array( min( $meta ), max( $meta ) );
+					$range = false;
+					if ( ! empty( $meta['min_meta'] ) && ! empty( $meta['max_meta'] ) ) {
+						$range = array( $meta['min_meta'], $meta['max_meta'] );
 					}
 
 					$range = apply_filters( "um_member_directory_filter_{$filter}_slider", $range, $directory_data );
@@ -780,7 +783,13 @@ if ( ! class_exists( 'um\core\Member_Directory' ) ) {
 				}
 				case 'birth_date': {
 					global $wpdb;
-					$meta = $wpdb->get_row( "SELECT MIN( meta_value ) as min_meta, MAX( meta_value ) as max_meta, COUNT( DISTINCT meta_value ) as amount FROM {$wpdb->usermeta} WHERE meta_key='birth_date'", ARRAY_A );
+					$meta = $wpdb->get_row(
+						"SELECT MIN( meta_value ) as min_meta, 
+						MAX( meta_value ) as max_meta, 
+						COUNT( DISTINCT meta_value ) as amount 
+						FROM {$wpdb->usermeta} 
+						WHERE meta_key='birth_date'",
+					ARRAY_A );
 
 					if ( empty( $meta ) || ! isset( $meta['amount'] ) || $meta['amount'] === 1 ) {
 						$range = false;
diff --git a/languages/ultimate-member-en_US.po b/languages/ultimate-member-en_US.po
index 42e496d8..14f17683 100644
--- a/languages/ultimate-member-en_US.po
+++ b/languages/ultimate-member-en_US.po
@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Ultimate Member\n"
-"POT-Creation-Date: 2020-01-13 16:46+0200\n"
-"PO-Revision-Date: 2020-01-13 16:46+0200\n"
+"POT-Creation-Date: 2020-01-13 23:16+0200\n"
+"PO-Revision-Date: 2020-01-13 23:16+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en_US\n"
@@ -4645,7 +4645,7 @@ msgid "Register"
 msgstr ""
 
 #: includes/class-config.php:135 includes/class-config.php:791
-#: includes/core/class-member-directory.php:2080
+#: includes/core/class-member-directory.php:2089
 #: includes/core/um-actions-profile.php:1258
 #: includes/core/um-actions-user.php:19
 msgid "Logout"
@@ -7208,27 +7208,27 @@ msgstr ""
 msgid "User Registered"
 msgstr ""
 
-#: includes/core/class-member-directory.php:821
-#: includes/core/class-member-directory.php:822
+#: includes/core/class-member-directory.php:830
+#: includes/core/class-member-directory.php:831
 msgid " stars"
 msgstr ""
 
-#: includes/core/class-member-directory.php:832
+#: includes/core/class-member-directory.php:841
 msgid "<strong>Age:</strong>&nbsp;{value} years old"
 msgstr ""
 
-#: includes/core/class-member-directory.php:833
+#: includes/core/class-member-directory.php:842
 msgid "<strong>Age:</strong>&nbsp;{min_range} - {max_range} years old"
 msgstr ""
 
-#: includes/core/class-member-directory.php:2025
-#: includes/core/class-member-directory.php:2069
+#: includes/core/class-member-directory.php:2034
+#: includes/core/class-member-directory.php:2078
 #: includes/core/um-actions-profile.php:1225
 #: includes/core/um-actions-profile.php:1256
 msgid "Edit Profile"
 msgstr ""
 
-#: includes/core/class-member-directory.php:2075
+#: includes/core/class-member-directory.php:2084
 #: includes/core/um-actions-profile.php:1257
 msgid "My Account"
 msgstr ""