diff --git a/changelog.txt b/changelog.txt
index 0a6876b0..1d1cb14d 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,5 +1,12 @@
 == Changelog ==
 
+= 2.31.4 – 02 February 2025 =
+* Added Compatibility for Events Manager.
+* AIOSEO: Loaded plugin widgets.
+* Refactored SEO plugin compatibility and restored Yoast Block Editor content parsing.
+* Layout Directory: Resolved incorrect empty search after search query.
+* WPML: Adjusted editor labels for the WPML 4.7 release.
+
 = 2.31.3 – 20 December 2024 =
 * WPML: Improved compatibility by excluding `panels_data` field from automatic translation handling.
 * Prebuilt Layouts: Added text/html to accepted mime types for layout exports.
diff --git a/compat/aioseo.php b/compat/aioseo.php
new file mode 100644
index 00000000..973b20f7
--- /dev/null
+++ b/compat/aioseo.php
@@ -0,0 +1,12 @@
+<?php
+// AIOSEO compatibility. We need to add their widgets to a sidebar
+// to ensure they're useable in Page Builder.
+function siteorigin_panels_load_aioseo_widgets( $sidebars = array() ) {
+	$sidebars['aio_pb_compat'] = array(
+		'aioseo-breadcrumb-widget',
+		'aioseo-html-sitemap-widget',
+	);
+
+	return $sidebars;
+}
+add_filter( 'sidebars_widgets', 'siteorigin_panels_load_aioseo_widgets', 10, 1 );
\ No newline at end of file
diff --git a/compat/events-manager.php b/compat/events-manager.php
new file mode 100644
index 00000000..516f7312
--- /dev/null
+++ b/compat/events-manager.php
@@ -0,0 +1,55 @@
+<?php
+if ( ! function_exists( 'em_content' ) ) {
+	return;
+}
+
+$em_pb_removed = false;
+
+/**
+ * Disable Page Builder for Events Manager post types.
+ *
+ * This function checks if the current post is an Events Manager post type
+ * and if Page Builder is enabled for it. If both conditions are met, it
+ * disables Page Builder for the content. This is done to prevent Page Builder
+ * from interfering with the Events Manager content, and vice versa.
+ *
+ * `loop_start` is used due to when the Events Manager plugin sets up its
+ * content replacement.
+ *
+ * @return void
+ */
+function siteorigin_panels_event_manager_loop_start() {
+	$em_post_types = array( 'event-recurring', 'event' );
+
+	// Is the current post an $em_post_types post?
+	$post_type = get_post_type();
+	if ( ! in_array( $post_type, $em_post_types ) ) {
+		return;
+	}
+
+	// Is Page Builder enabled for Events Manager post types?
+	$pb_post_types = siteorigin_panels_setting( 'post-types' );
+	if ( empty( $pb_post_types ) || ! array_intersect( $em_post_types, $pb_post_types ) ) {
+		return;
+	}
+
+	global $em_pb_removed;
+	$em_pb_removed = true;
+
+	add_filter( 'siteorigin_panels_filter_content_enabled', '__return_false' );
+}
+add_action( 'loop_start', 'siteorigin_panels_event_manager_loop_start' );
+
+/**
+ * Re-enable Page Builder for `the_content` filter if it
+ * was disabled at the start of the loop.
+ */
+function siteorigin_panels_event_manager_loop_end() {
+	global $em_pb_removed;
+
+	if ( $em_pb_removed ) {
+		remove_filter( 'siteorigin_panels_filter_content_enabled', '__return_false' );
+	}
+
+}
+add_action( 'loop_end' , 'siteorigin_panels_event_manager_loop_end' );
diff --git a/inc/admin-layouts.php b/inc/admin-layouts.php
index fd4110e2..1c3c7899 100644
--- a/inc/admin-layouts.php
+++ b/inc/admin-layouts.php
@@ -283,11 +283,17 @@ public function action_get_prebuilt_layouts() {
 				return false;
 			}
 
-			$cache = get_transient( 'siteorigin_panels_layouts_directory_' . $directory_id .'_page_' . $page_num );
+			// If the user isn't searching, check if we have a cached
+			// version of the results.
+			if ( empty( $search ) ) {
+				$cache = get_transient( 'siteorigin_panels_layouts_directory_cache_' . $directory_id .'_page_' . $page_num );
 
-			if ( empty( $search ) && ! empty( $cache ) ) {
-				$return = $cache;
-			} else {
+				if ( ! empty( $cache ) ) {
+					$return = $cache;
+				}
+			}
+
+			if ( empty( $return['items'] ) ) {
 				$url = add_query_arg( $query, $directory[ 'url' ] . 'wp-admin/admin-ajax.php?action=query_layouts' );
 
 				if ( ! empty( $directory['args'] ) && is_array( $directory['args'] ) ) {
@@ -319,7 +325,11 @@ public function action_get_prebuilt_layouts() {
 					}
 
 					$return['max_num_pages'] = $results['max_num_pages'];
-					set_transient( 'siteorigin_panels_layouts_directory_' . $directory_id .'_page_' . $page_num, $return, 86400 );
+
+					// If the user isn't searching, cache the results.
+					if ( empty( $search ) ) {
+						set_transient( 'siteorigin_panels_layouts_directory_cache_' . $directory_id .'_page_' . $page_num, $return, 86400 );
+					}
 				}
 			}
 		} elseif ( strpos( $type, 'clone_' ) !== false ) {
diff --git a/inc/admin-widget-dialog.php b/inc/admin-widget-dialog.php
index 2428b791..048fd461 100644
--- a/inc/admin-widget-dialog.php
+++ b/inc/admin-widget-dialog.php
@@ -165,7 +165,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 		if ( defined( 'WOOCOMMERCE_VERSION' ) ) {
 			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
-				'title'  => __( 'WooCommerce', 'woocommerce' ),
+				'title'  => __( 'WooCommerce', 'siteorigin-panels' ),
 				'filter' => array(
 					'groups' => array( 'woocommerce' ),
 				),
@@ -176,7 +176,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 		if ( defined( 'JETPACK__VERSION' ) ) {
 			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
-				'title'  => __( 'Jetpack', 'jetpack' ),
+				'title'  => __( 'Jetpack', 'siteorigin-panels' ),
 				'filter' => array(
 					'groups' => array( 'jetpack' ),
 				),
@@ -187,7 +187,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 		if ( function_exists( 'bbpress' ) ) {
 			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
-				'title'  => __( 'BBPress', 'bbpress' ),
+				'title'  => __( 'BBPress', 'siteorigin-panels' ),
 				'filter' => array(
 					'groups' => array( 'bbpress' ),
 				),
diff --git a/inc/compatibility.php b/inc/compatibility.php
index bbe15b52..fcb4d682 100644
--- a/inc/compatibility.php
+++ b/inc/compatibility.php
@@ -7,8 +7,9 @@ class SiteOrigin_Panels_Compatibility {
 
 	public function __construct() {
 		$this->compat_path = plugin_dir_path( SITEORIGIN_PANELS_BASE_FILE ) . 'compat/';
-		add_action( 'admin_init', array( $this, 'admin_init' ) );
-		add_action( 'init', array( $this, 'init' ), 100 );
+		add_action( 'admin_init', array( $this, 'admin_init' ), 10, 0 );
+		add_action( 'init', array( $this, 'init' ), 100, 0 );
+		add_action( 'widgets_init', array( $this, 'widgets_init' ), 1, 0 );
 	}
 
 	public static function single() {
@@ -115,5 +116,17 @@ function_exists( 'yoast_wpseo_video_seo_init' )
 		if ( class_exists( 'PUM_Site' )) {
 			require_once $this->compat_path . 'popup-maker.php';
 		}
+
+		// Compatibility with Events Manager.
+		if ( defined( 'EM_VERSION' ) ) {
+			require_once $this->compat_path . 'events-manager.php';
+		}
+	}
+
+	public function widgets_init() {
+		// Compatibility for All in One SEO.
+		if ( function_exists( 'aioseo' ) ) {
+			require_once $this->compat_path . 'aioseo.php';
+		}
 	}
 }
diff --git a/inc/styles-admin.php b/inc/styles-admin.php
index 564c7b09..3d33cb0e 100644
--- a/inc/styles-admin.php
+++ b/inc/styles-admin.php
@@ -161,7 +161,9 @@ public function render_styles_fields( $section, $before = '', $after = '', $curr
 			?>
 			<div class="style-section-wrapper">
 				<div class="style-section-head" tabindex="0">
-					<h4><?php esc_html_e( $group['name'] ); ?></h4>
+					<h4>
+						<?php echo esc_html( $group['name'] ); ?>
+					</h4>
 				</div>
 				<div class="style-section-fields" style="display: none">
 					<?php
@@ -173,7 +175,7 @@ public function render_styles_fields( $section, $before = '', $after = '', $curr
 							<div class="style-field-wrapper so-field-<?php echo esc_attr( $field_id ); ?>">
 								<?php if ( ! empty( $field['name'] ) ) { ?>
 									<label>
-										<?php esc_html_e( $field['name'] ); ?>
+										<?php echo esc_html( $field['name'] ); ?>
 									</label>
 								<?php } ?>
 								<div
@@ -235,8 +237,9 @@ public function render_style_field( $field, $current, $field_id, $current_styles
 				<select
 					class="measurement-unit measurement-unit-<?php echo ! empty( $field['multiple'] ) ? 'multiple' : 'single'; ?>">
 					<?php foreach ( $this->measurements_list() as $measurement ) { ?>
-						<option
-							value="<?php echo esc_attr( $measurement ); ?>"><?php esc_html_e( $measurement ); ?></option>
+						<option value="<?php echo esc_attr( $measurement ); ?>">
+							<?php echo esc_html( $measurement ); ?>
+						</option>
 					<?php } ?>
 				</select>
 				<input type="hidden" name="<?php echo esc_attr( $field_name ); ?>"
@@ -317,12 +320,19 @@ class="image-fallback widefat" />
 				?>
 				<select name="<?php echo esc_attr( $field_name ); ?>">
 					<?php foreach ( $sizes as $size_name => $size_config ) { ?>
-						<?php $sizing_label = ! empty( $size_config['width'] ) && is_numeric( $size_config['width'] ) ? ' (' . $size_config['width'] . 'x' . $size_config['height'] . ')' : ''; ?>
+						<?php
+						$sizing_label = ! empty( $size_config['width'] ) && is_numeric( $size_config['width'] ) ? ' (' . $size_config['width'] . 'x' . $size_config['height'] . ')' : '';
+						?>
 						<option
 							value="<?php echo esc_attr( $size_name ); ?>"
 							<?php selected( $current, $size_name ); ?>
 						>
-							<?php esc_html_e( ucwords( preg_replace( '/[-_]/', ' ', $size_name ) ) . $sizing_label ); ?>
+							<?php
+							echo esc_html(
+								ucwords( preg_replace( '/[-_]/', ' ', $size_name ) ) .
+								$sizing_label
+							);
+							?>
 						</option>
 					<?php } ?>
 				</select>
@@ -363,7 +373,9 @@ class="image-fallback widefat" />
 				?>
 				<label class="so-checkbox-label">
 					<input type="checkbox" name="<?php echo esc_attr( $field_name ); ?>" <?php checked( $current ); ?> />
-					<?php esc_html_e( isset( $field['label'] ) ? $field['label'] : __( 'Enabled', 'siteorigin-panels' ) ); ?>
+					<?php
+					echo esc_html( isset( $field['label'] ) ? $field['label'] : __( 'Enabled', 'siteorigin-panels' ) );
+					?>
 				</label>
 				<?php
 				break;
@@ -373,7 +385,11 @@ class="image-fallback widefat" />
 				<select name="<?php echo esc_attr( $field_name ); ?>">
 					<?php foreach ( $field['options'] as $k => $v ) { ?>
 						<option
-							value="<?php echo esc_attr( $k ); ?>" <?php selected( $current, $k ); ?>><?php esc_html_e( $v ); ?></option>
+							value="<?php echo esc_attr( $k ); ?>"
+							<?php selected( $current, $k ); ?>
+						>
+							<?php echo esc_html( $v ); ?>
+						</option>
 					<?php } ?>
 				</select>
 				<?php
@@ -403,9 +419,13 @@ class="image-fallback widefat" />
 				foreach ( $field['options'] as $k => $v ) {
 					?>
 					<label for="<?php echo esc_attr( $radio_id . '-' . $k ); ?>">
-						<input type="radio" name="<?php echo esc_attr( $radio_id ); ?>"
-					       id="<?php echo esc_attr( $radio_id . '-' . $k ); ?>"
-					       value="<?php echo esc_attr( $k ); ?>" <?php checked( $k, $current ); ?>> <?php esc_html_e( $v ); ?>
+						<input
+							type="radio"
+							name="<?php echo esc_attr( $radio_id ); ?>"
+							id="<?php echo esc_attr( $radio_id . '-' . $k ); ?>"
+							value="<?php echo esc_attr( $k ); ?>" <?php checked( $k, $current ); ?>
+						>
+						<?php echo esc_html( $v ); ?>
 					</label>
 					<?php
 				}
@@ -413,17 +433,24 @@ class="image-fallback widefat" />
 
 			case 'textarea' :
 			case 'code' :
-				?><textarea type="text" name="<?php echo esc_attr( $field_name ); ?>"
-				            class="widefat <?php if ( $field['type'] == 'code' ) {
-				            	echo 'so-field-code';
-				            } ?>" rows="4"><?php echo esc_textarea( stripslashes( $current ) ); ?></textarea><?php
+				?><textarea
+					type="text"
+					name="<?php echo esc_attr( $field_name ); ?>"
+					class="widefat <?php if ( $field['type'] == 'code' ) {
+						echo 'so-field-code';
+					} ?>"
+					rows="4"
+				><?php
+				echo esc_textarea( stripslashes( $current ) );
+				?></textarea>
+				<?php
 				break;
 
 			case 'toggle' :
 				$current = (bool) $current;
-				?>
 
-				<?php esc_html_e( isset( $field['label'] ) ? $field['label'] : '' ); ?>
+				echo esc_html( isset( $field['label'] ) ? $field['label'] : '' );
+				?>
 				<label class="so-toggle-switch">
 					<input class="so-toggle-switch-input" type="checkbox" <?php checked( $current ); ?> name="<?php echo esc_attr( $field_name ); ?>">
 					<span class="so-toggle-switch-label" data-on="<?php esc_attr_e( 'On', 'siteorigin-panels' ); ?>" data-off="<?php esc_attr_e( 'Off', 'siteorigin-panels' ); ?>"></span>
@@ -437,7 +464,7 @@ class="widefat <?php if ( $field['type'] == 'code' ) {
 							<div class="style-field-wrapper so-field-<?php echo esc_attr( $sub_field_id ); ?>">
 								<?php if ( ! empty( $sub_field['name'] ) ) { ?>
 									<label>
-										<?php esc_html_e( $sub_field['name'] ); ?>
+										<?php echo esc_html( $sub_field['name'] ); ?>
 									</label>
 								<?php } ?>
 								<div
diff --git a/inc/styles.php b/inc/styles.php
index 87cb886a..68c6625a 100644
--- a/inc/styles.php
+++ b/inc/styles.php
@@ -676,14 +676,14 @@ public function add_overlay( $html, $context ) {
 				?>
 				<div
 					class="panel-background-overlay"
-					<?php if ( ! empty( $styles ) ) { ?>
-						style="
-						<?php
+					<?php
+					if ( ! empty( $styles ) ) {
+						$style_attr = '';
 						foreach ( $styles as $p => $v ) {
-							esc_attr_e( $p . ':' . $v . ';' );
+							$style_attr .= $p . ':' . $v . ';';
 						}
 						?>
-						"
+						style="<?php echo esc_attr( $style_attr ); ?>"
 					<?php } ?>
 				>
 					<?php echo apply_filters( 'siteorigin_panels_overlay_content', '', $context, ! empty( $custom_overlay ) ); ?>
diff --git a/inc/widgets/post-loop-helper.php b/inc/widgets/post-loop-helper.php
index 01a092a0..a7c9b3fe 100644
--- a/inc/widgets/post-loop-helper.php
+++ b/inc/widgets/post-loop-helper.php
@@ -47,13 +47,13 @@ public function __construct( $templates ) {
 				),
 				'more' => array(
 					'type' => 'checkbox',
-					'label' => __( 'More link', 'so-widgets-bundle' ),
+					'label' => __( 'More link', 'siteorigin-panels' ),
 					'description' => __( 'If the template supports it, cut posts and display the more link.', 'siteorigin-panels' ),
 					'default' => false,
 				),
 				'posts' => array(
 					'type' => 'posts',
-					'label' => __( 'Posts query', 'so-widgets-bundle' ),
+					'label' => __( 'Posts query', 'siteorigin-panels' ),
 					'hide' => true,
 				),
 			)
diff --git a/js/seo-compat.js b/js/seo-compat.js
index a4492473..dad6c93b 100644
--- a/js/seo-compat.js
+++ b/js/seo-compat.js
@@ -1,71 +1,9 @@
-/* global jQuery, YoastSEO, _, panelsOptions */
+/* global jQuery, YoastSEO,rankMathEditor,  _, panelsOptions */
 
 jQuery( function( $ ) {
 
-
-	var SiteOriginSeoCompat = function() {
-
-		if ( typeof YoastSEO !== 'undefined' ) {
-			YoastSEO.app.registerPlugin( 'SiteOriginSeoCompat', { status: 'ready' } );
-			YoastSEO.app.registerModification( 'content', this.contentModification, 'SiteOriginSeoCompat', 5 );
-		}
-
-		if ( typeof rankMathEditor !== 'undefined' ) {
-			wp.hooks.addFilter( 'rank_math_content', 'SiteOriginSeoCompat', this.rankMath );
-		}
-
-	};
-
-	function isBlockEditorPanelsEnabled() {
-		return typeof window.soPanelsBuilderView !== 'undefined' && $( '.block-editor-page' ).length;
-	}
-
-	function isClassicEditorPanelsEnabled() {
-		return $( '#so-panels-panels.attached-to-editor' ).is( ':visible' );
-	}
-
-	SiteOriginSeoCompat.prototype.rankMath = function( data ) {
-		if ( ! data ) {
-			return data;
-		}
-
-		if ( isClassicEditorPanelsEnabled() && ! isBlockEditorPanelsEnabled() ) {
-			data = SiteOriginSeoCompat.prototype.contentModification( data );
-			return data;
-		}
-
-		if ( ! isBlockEditorPanelsEnabled() ) {
-			return data;
-		}
-
-		const soBlock = data.match(
-			/<!--\s*wp:siteorigin-panels\/layout-block[\s\S]*?\/-->/g
-		);
-
-		// Replace any found SO Layout blocks with the rendered contents.
-		if ( soBlock ) {
-			soBlock.forEach( function( block ) {
-				data = data.replace( block, SiteOriginSeoCompat.prototype.contentModification( block ) );
-			} );
-		}
-
-		return data;
-	}
-
-	SiteOriginSeoCompat.prototype.contentModification = function( data ) {
-		const isBlockEditor = isBlockEditorPanelsEnabled();
-		// Check if the editor has Page Builder Enabled before proceeding.
-		if (
-			window.soPanelsBuilderView === undefined ||
-			(
-				! isClassicEditorPanelsEnabled() &&
-				! isBlockEditor
-			)
-		) {
-			return;
-		}
-
-		var whitelist = [
+	const SiteOriginSeoCompat = () => ({
+		allowedTags: [
 			'p', 'a', 'img', 'caption', 'br',
 			'blockquote', 'cite',
 			'em', 'strong', 'i', 'b',
@@ -73,10 +11,113 @@ jQuery( function( $ ) {
 			'h1', 'h2', 'h3', 'h4', 'h5', 'h6',
 			'ul', 'ol', 'li',
 			'table', 'tr', 'th', 'td'
-		].join( ',' );
+		].join( ',' ),
+
+		isClassicEditorPanelsEnabled: function() {
+			return $( '#so-panels-panels.attached-to-editor' ).is( ':visible' );
+		},
+
+		isBlockEditorPanelsEnabled: function() {
+			return typeof window.soPanelsBuilderView !== 'undefined' && $( '.block-editor-page' ).length
+		},
+
+		/**
+		 * Find SiteOrigin layout blocks in the provided data.
+		 *
+		 * This function searches the provided data for SiteOrigin
+		 * layout blocks using a regular expression.
+		 * It matches block with the siteorigin-panels/layout-block name.
+		 *
+		 * @param {string} data - The data to search for SiteOrigin layout blocks.
+		 *
+		 * @returns {Array|null} An array of matched SiteOrigin layout blocks, or null if no matches are found.
+		 */
+		findSoLayoutBlocks: function( data ) {
+			return data.match(
+				/<!--\s*wp:siteorigin-panels\/layout-block[\s\S]*?\/-->/g
+			);
+		},
+
+		/**
+		 * Determine how to process the modified content based on context.
+		 *
+		 * This function is called by SEO plugins after a content modification.
+		 * It determines if the content is from the Classic Editor or the Block
+		 * Editor, and then processes it accordingly.
+		 *
+		 * @param {string} data - The content data to be modified.
+		 *
+		 * @returns {string} The modified content data.
+		 */
+		seoContentChange: function( data ) {
+			if ( ! data ) {
+				return data;
+			}
+
+			const isClassicEditor = this.isClassicEditorPanelsEnabled();
+			const isBlockEditor = this.isBlockEditorPanelsEnabled();
+
+			// If Page Builder isn't set up for this page,
+			// return the data as is.
+			if (
+				! isClassicEditor &&
+				! isBlockEditor
+			) {
+				return data;
+			}
+
+			// Is this the Classic Editor?
+			if (
+				isClassicEditor &&
+				! isBlockEditor
+			) {
+				return this.contentModification( data );
+			}
+
+			// The current context has to be the Block Editor.
+			return this.processBlocks( data );
+		},
+
+		/**
+		 * Process SiteOrigin layout blocks in the content.
+		 *
+		 * This function searches for SiteOrigin layout blocks in the
+		 * content and replaces them with the rendered contents. This allows SEO
+		 * plugins to correctly analyze the content of the SO Layout blocks.
+		 *
+		 * @param {string} data - The content data to be processed.
+		 *
+		 * @returns {string} The processed content data.
+		 */
+		processBlocks: function( data ) {
+			const soBlocks = this.findSoLayoutBlocks( data );
+
+			// If there are no SO Layout blocks, return the data as is.
+			if ( ! soBlocks ) {
+				return data;
+			}
 
-		var extractContent = function( data ) {
-			var $data = $( data );
+			// Replace any found SO Layout blocks with the rendered contents.
+			soBlocks.forEach( function( block ) {
+				data = data.replace( block, this.contentModification( block ) );
+			}, this );
+
+			return data;
+		},
+
+		/**
+		 * Extract text from the provided data.
+		 *
+		 * This function extracts content from the provided data by removing
+		 * elements that have no content analysis value and filtering out
+		 * everything else that's not in the allowed tags list.
+		 *
+		 * @param {string} data - The content data to be extracted.
+		 *
+		 * @returns {string} The extracted content data.
+		 */
+		extractContent: function( data ) {
+			const $data = $( data );
 
 			if ( $data.find( '.so-panel' ).length === 0 ) {
 				// Skip this for empty pages
@@ -86,34 +127,58 @@ jQuery( function( $ ) {
 			// Remove elements that have no content analysis value.
 			$data.find( 'iframe, script, style, link' ).remove();
 
-			$data.find( "*") .not( whitelist ).each( function() {
-				var content = $( this ).contents();
-				$( this ).replaceWith( content );
+			// Filter out everything else that's not in the allowed tags list.
+			$data.find( '*' ) .not( this.allowedTags ).each( function() {
+				const $$ = $( this );
+
+				$$.replaceWith(
+					$$.contents()
+				);
 			} );
 
 			return $data.html();
-		};
+		},
+
+		/**
+		 * Modify the content for SEO analysis.
+		 *
+		 * This function modifies the content for SEO analysis by
+		 * extracting content from the SiteOrigin Panels Builder view.
+		 *
+		 * @param {string} data - The content data to be modified.
+		 *
+		 * @returns {string} The modified content data.
+		 */
+		contentModification: function( data ) {
+			if ( ! Array.isArray( window.soPanelsBuilderView ) ) {
+				return this.extractContent( window.soPanelsBuilderView.contentPreview );
+			}
 
-		if ( ! Array.isArray( window.soPanelsBuilderView ) ) {
-			data = extractContent( window.soPanelsBuilderView.contentPreview );
-		} else {
 			data = null;
 			window.soPanelsBuilderView.forEach( function( panel ) {
-				data += extractContent( panel.contentPreview );
-			} );
-		}
+				data += this.extractContent( panel.contentPreview );
+			}, this );
+
+			return data;
+		},
 
-		return data;
-	};
+		init: function() {
+			if ( typeof YoastSEO !== 'undefined' ) {
+				YoastSEO.app.registerPlugin( 'SiteOriginSeoCompat', { status: 'ready' } );
+				YoastSEO.app.registerModification( 'content', this.seoContentChange.bind( this ), 'SiteOriginSeoCompat', 5 );
+			}
 
-	if ( typeof rankMathEditor !== 'undefined' ) {
-		new SiteOriginSeoCompat();
-	} else {
-		$( window ).on(
-			'YoastSEO:ready',
-			function () {
-				new SiteOriginSeoCompat();
+			if ( typeof rankMathEditor !== 'undefined' ) {
+				wp.hooks.addFilter( 'rank_math_content', 'SiteOriginSeoCompat', this.seoContentChange.bind( this ) );
 			}
-		);
+		}
+	} );
+
+	if ( typeof rankMathEditor !== 'undefined' ) {
+		SiteOriginSeoCompat().init();
 	}
+
+	$( window ).on( 'YoastSEO:ready', () => {
+		SiteOriginSeoCompat().init();
+	} );
 } );
diff --git a/js/siteorigin-panels/dialog/row.js b/js/siteorigin-panels/dialog/row.js
index 5927274f..012f2a7f 100644
--- a/js/siteorigin-panels/dialog/row.js
+++ b/js/siteorigin-panels/dialog/row.js
@@ -49,6 +49,7 @@ module.exports = panels.view.dialog.extend({
 
 		// Changing the row.
 		'click .row-set-form .so-row-field': 'changeCellTotal',
+		'change .row-set-form .so-row-field': 'changeCellTotal',
 		'click .cell-resize-sizing span': 'changeCellRatio',
 		'click .cell-resize-direction ': 'changeSizeDirection',
 
@@ -184,10 +185,6 @@ module.exports = panels.view.dialog.extend({
 			this.$( 'input[name="cells"].so-row-field' ).val( this.model.get( 'cells' ).length );
 		}
 
-		this.$( 'input.so-row-field' ).on( 'keyup', function() {
-			$(this).trigger('change');
-		});
-
 		return this;
 	},
 
diff --git a/readme.txt b/readme.txt
index 64f0da47..0fb120a7 100644
--- a/readme.txt
+++ b/readme.txt
@@ -121,6 +121,13 @@ SiteOrigin offers a single premium plugin that enhances and extends Page Builder
 
 == Changelog ==
 
+= 2.31.4 – 02 February 2025 =
+* Added Compatibility for Events Manager.
+* AIOSEO: Loaded plugin widgets.
+* Refactored SEO plugin compatibility and restored Yoast Block Editor content parsing.
+* Layout Directory: Resolved incorrect empty search after search query.
+* WPML: Adjusted editor labels for the WPML 4.7 release.
+
 = 2.31.3 – 20 December 2024 =
 * WPML: Improved compatibility by excluding `panels_data` field from automatic translation handling.
 * Prebuilt Layouts: Added text/html to accepted mime types for layout exports.
diff --git a/siteorigin-panels.php b/siteorigin-panels.php
index c9fba450..ca213b10 100644
--- a/siteorigin-panels.php
+++ b/siteorigin-panels.php
@@ -464,7 +464,7 @@ private function get_localized_word_count( $text ) {
 		// From the core `wp_trim_words` function to get localized word count.
 		$text = wp_strip_all_tags( $text );
 
-		if ( strpos( _x( 'words', 'Word count type. Do not translate!' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
+		if ( strpos( _x( 'words', 'Word count type. Do not translate!', 'siteorigin-panels' ), 'characters' ) === 0 && preg_match( '/^utf\-?8$/i', get_option( 'blog_charset' ) ) ) {
 			$text = trim( preg_replace( "/[\n\r\t ]+/", ' ', $text ), ' ' );
 			preg_match_all( '/./u', $text, $words_array );
 			$words_array = $words_array[0];
diff --git a/tpl/js-templates.php b/tpl/js-templates.php
index 5dbbf4a1..640e97e8 100644
--- a/tpl/js-templates.php
+++ b/tpl/js-templates.php
@@ -110,8 +110,8 @@
 								foreach ( $row_colors as $id => $color ) {
 									$name = ! empty( $color['name'] ) ? sanitize_title( $color['name'] ) : $id;
 									?>
-									<div data-color-label="<?php esc_attr_e( $name ); ?>"
-										class="<?php esc_attr_e( 'so-row-color so-row-color-' . $name ); ?>{{% if( rowColorLabel == '<?php esc_attr_e( $name ); ?>' ) print(' so-row-color-selected'); %}}"
+									<div data-color-label="<?php echo esc_attr( $name ); ?>"
+										class="<?php esc_attr_e( 'so-row-color so-row-color-' . $name ); ?>{{% if( rowColorLabel == '<?php echo esc_attr( $name ); ?>' ) print(' so-row-color-selected'); %}}"
 									></div>
 								<?php } ?>
 							</li>
@@ -450,7 +450,9 @@ class="button-secondary dashicons so-mode"
 				foreach ( $tabs as $id => $tab ) {
 					?>
 					<li>
-						<a href="#<?php esc_attr_e( $id ); ?>"><?php echo esc_html( $tab ); ?></a>
+						<a href="#<?php echo esc_attr( $id ); ?>">
+							<?php echo esc_html( $tab ); ?>
+						</a>
 					</li>
 					<?php
 				}
diff --git a/wpml-config.xml b/wpml-config.xml
index d99272d6..f8882609 100644
--- a/wpml-config.xml
+++ b/wpml-config.xml
@@ -147,293 +147,96 @@
   <siteorigin-widgets>
     <widget name="WP_Widget_Archives">
       <fields>
-        <field type="Archive title">title</field>
+        <field type="Archive: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Media_Audio">
       <fields>
-        <field type="Audio title">title</field>
-        <field type="Audio URL" editor_type="LINK">url</field>
+        <field type="Audio: Title">title</field>
+        <field type="Audio: URL" editor_type="LINK">url</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Calendar">
       <fields>
-        <field type="Calendar title">title</field>
+        <field type="Calendar: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Categories">
       <fields>
-        <field type="Categories title">title</field>
+        <field type="Categories: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Custom_HTML">
       <fields>
-        <field type="Custom HTML title">title</field>
-        <field type="Custom HTML content" editor_type="AREA">content</field>
+        <field type="Custom HTML: Title">title</field>
+        <field type="Custom HTML: Content" editor_type="AREA">content</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Media_Gallery">
       <fields>
-        <field type="Gallery title">title</field>
+        <field type="Gallery: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Media_Image">
       <fields>
-        <field type="Image title">title</field>
-        <field type="Image caption">caption</field>
-        <field type="Image URL" editor_type="LINK">url</field>
+        <field type="Image: Title">title</field>
+        <field type="Image: Caption">caption</field>
+        <field type="Image: URL" editor_type="LINK">url</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Meta">
       <fields>
-        <field type="Meta title">title</field>
+        <field type="Meta: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Text_Icl">
       <fields>
-        <field type="Title">title</field>
-        <field type="Text" editor_type="AREA">text</field>
+        <field type="Widget: Title">title</field>
+        <field type="Widget: Text" editor_type="AREA">text</field>
       </fields>
     </widget>
     <widget name="WP_Nav_Menu_Widget">
       <fields>
-        <field type="Menu title">title</field>
+        <field type="Menu: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Pages">
       <fields>
-        <field type="Pages title">title</field>
+        <field type="Pages: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_RSS">
       <fields>
-        <field type="RSS title">title</field>
-        <field type="RSS URL" editor_type="LINK">url</field>
+        <field type="RSS: Title">title</field>
+        <field type="RSS: URL" editor_type="LINK">url</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Recent_Comments">
       <fields>
-        <field type="Comments title">title</field>
+        <field type="Recent Comments: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Recent_Posts">
       <fields>
-        <field type="Posts title">title</field>
+        <field type="Recent Posts: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Search">
       <fields>
-        <field type="Search title">title</field>
+        <field type="Search: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Tag_Cloud">
       <fields>
-        <field type="Tag cloud title">title</field>
+        <field type="Tag Cloud: Title">title</field>
       </fields>
     </widget>
     <widget name="WP_Widget_Text">
       <fields>
-        <field type="Title">title</field>
-        <field type="Text" editor_type="AREA">text</field>
+        <field type="Widget: Title">title</field>
+        <field type="Widget: Text" editor_type="AREA">text</field>
       </fields>
     </widget>
-    <widget name="SiteOrigin_Widget_Accordion_Widget">
-      <fields>
-        <field type="Accordion title">title</field>
-      </fields>
-      <fields-in-item items_of="panels">
-        <field type="Accordion panel title">title</field>
-        <field type="Accordion panel content_text" editor_type="VISUAL">content_text</field>
-        <field type="Accordion panel content_layout">content_layout</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Anything_Carousel_Widget">
-      <fields>
-        <field type="Anything carousel title">title</field>
-      </fields>
-      <fields-in-item items_of="items">
-        <field type="Anything carousel panel title">title</field>
-        <field type="Anything carousel panel content_text" editor_type="VISUAL">content_text</field>
-        <field type="Anything carousel panel content_layout">content_layout</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Button_Widget">
-      <fields>
-        <field type="Button text">text</field>
-        <field type="Button URL" editor_type="LINK">url</field>
-        <field type="Button title">attributes>title</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widgets_ContactForm_Widget">
-      <fields>
-        <field type="Contact form title">title</field>
-        <field type="Contact form default subject">settings>default_subject</field>
-        <field type="Contact form subject prefix">settings>subject_prefix</field>
-        <field type="Contact form success message">settings>success_message</field>
-        <field type="Contact form submit text">settings>submit_text</field>
-      </fields>
-      <fields-in-item items_of="fields">
-        <field type="Contact form field label">label</field>
-        <field type="Contact form field description">description</field>
-        <field type="Contact form field missing">required>missing_message</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Cta_Widget">
-      <fields>
-        <field type="CTA title">title</field>
-        <field type="CTA sub title">sub_title</field>
-        <field type="CTA button text">button>text</field>
-        <field type="CTA button URL" editor_type="LINK">button>destination_url</field>
-        <field type="CTA button title">attributes>title</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_Editor_Widget">
-      <fields>
-        <field type="Editor title">title</field>
-        <field type="Editor content" editor_type="VISUAL">text</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_Features_Widget">
-      <fields-in-item items_of="features">
-        <field type="Feature title">title</field>
-        <field type="Feature text" editor_type="VISUAL">text</field>
-        <field type="Feature icon title">icon_title</field>
-        <field type="Feature more text">more_text</field>
-        <field type="Feature more URL" editor_type="LINK">more_url</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Headline_Widget">
-      <fields>
-        <field type="Headline text">headline>text</field>
-        <field type="Headline URL" editor_type="LINK">headline>destination_url</field>
-        <field type="Sub headline text">sub_headline>text</field>
-        <field type="Sub headline URL" editor_type="LINK">sub_headline>destination_url</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_Hero_Widget">
-      <fields-in-item items_of="frames">
-        <field type="Hero content" editor_type="VISUAL">content</field>
-      </fields-in-item>
-      <fields-in-item items_of="frames>buttons">
-        <field type="Hero button text">button>text</field>
-        <field type="Hero button link" editor_type="LINK">button>url</field>
-        <field type="Hero button link title">button>attributes>title</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Icon_Widget">
-      <fields>
-        <field type="Icon title">title</field>
-        <field type="Icon URL" editor_type="LINK">url</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_Image_Widget">
-      <fields>
-        <field type="Image title">title</field>
-        <field type="Image alt">alt</field>
-        <field type="Image URL" editor_type="LINK">url</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widgets_ImageGrid_Widget">
-      <fields-in-item items_of="images">
-        <field type="Image title">title</field>
-        <field type="Image alt">alt</field>
-        <field type="Image URL" editor_type="LINK">url</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_PostCarousel_Widget">
-      <fields>
-        <field type="Post carousel title">title</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_PriceTable_Widget">
-      <fields>
-        <field type="Price table title">title</field>
-      </fields>
-      <fields-in-item items_of="columns">
-        <field type="Price title">title</field>
-        <field type="Price subtitle">subtitle</field>
-        <field type="Price image title">image_title</field>
-        <field type="Price image alt">image_alt</field>
-        <field type="Price per">per</field>
-        <field type="Price button text">button_text</field>
-        <field type="Price button URL" editor_type="LINK">url</field>
-      </fields-in-item>
-      <fields-in-item items_of="columns>features">
-        <field type="Feature text">features>text</field>
-        <field type="Feature hover text">features>hover_text</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Simple_Masonry_Widget">
-      <fields>
-        <field type="Simple masonry title">title</field>
-      </fields>
-      <fields-in-item items_of="items">
-        <field type="Simple masonry item title">title</field>
-        <field type="Simple masonry item URL" editor_type="LINK">url</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Slider_Widget">
-      <fields-in-item items_of="frames">
-        <field type="Slide URL" editor_type="LINK">url</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_SocialMediaButtons_Widget">
-      <fields>
-        <field type="Social media buttons title">title</field>
-      </fields>
-      <fields-in-item items_of="networks">
-        <field type="Social Network URL" editor_type="LINK">url</field>
-        <field type="Social Network icon title">icon_title</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Tabs_Widget">
-      <fields>
-        <field type="Tab title">title</field>
-      </fields>
-      <fields-in-item items_of="tabs">
-        <field type="Tabs title">title</field>
-        <field type="Tab content_text" editor_type="VISUAL">content_text</field>
-        <field type="Tab content_layout">content_layout</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Taxonomy_Widget">
-      <fields>
-        <field type="Taxonomy title">title</field>
-        <field type="Taxonomy label">label</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widgets_Testimonials_Widget">
-      <fields>
-        <field type="Testimonials title">title</field>
-      </fields>
-      <fields-in-item items_of="testimonials">
-        <field type="Testimonial text" editor_type="VISUAL">text</field>
-        <field type="Testimonial URL" editor_type="LINK">url</field>
-      </fields-in-item>
-    </widget>
-    <widget name="SiteOrigin_Widget_Video_Widget">
-      <fields>
-        <field type="Video title">title</field>
-      </fields>
-    </widget>
-    <widget name="SiteOrigin_Widget_PriceTable_Widget">
-      <fields>
-        <field type="Price table title">title</field>
-      </fields>
-      <fields-in-item items_of="columns">
-        <field type="Price title">title</field>
-        <field type="Price subtitle">subtitle</field>
-        <field type="Price image title">image_title</field>
-        <field type="Price image alt">image_alt</field>
-        <field type="Price per">per</field>
-        <field type="Price button text">button</field>
-        <field type="Price button URL" editor_type="LINK">url</field>
-      </fields-in-item>
-      <fields-in-item items_of="columns>features">
-        <field type="Feature text">text</field>
-        <field type="Feature hover text">hover</field>
-      </fields-in-item>
-    </widget>
   </siteorigin-widgets>
   <custom-fields>
     <custom-field action="ignore">panels_data</custom-field>