diff --git a/src/bp-xprofile/bp-xprofile-admin.php b/src/bp-xprofile/bp-xprofile-admin.php
index 55c4b6d..d7f30e7 100644
--- a/src/bp-xprofile/bp-xprofile-admin.php
+++ b/src/bp-xprofile/bp-xprofile-admin.php
@@ -114,7 +114,10 @@ function xprofile_admin_screen( $message = '', $type = 'error' ) {
 
 						<li id="group_<?php echo esc_attr( $group->id ); ?>">
 							<a href="#tabs-<?php echo esc_attr( $group->id ); ?>" class="ui-tab">
-								<?php echo esc_attr( $group->name ); ?>
+								<?php
+								/** This filter is documented in bp-xprofile/bp-xprofile-template.php */
+								echo esc_html( apply_filters( 'bp_get_the_profile_group_name', $group->name ) );
+								?>
 
 								<?php if ( !$group->can_delete ) : ?>
 									<?php _e( '(Primary)', 'buddypress'); ?>
@@ -130,7 +133,10 @@ function xprofile_admin_screen( $message = '', $type = 'error' ) {
 				<?php if ( !empty( $groups ) ) : foreach ( $groups as $group ) : ?>
 
 					<noscript>
-						<h3><?php echo esc_attr( $group->name ); ?></h3>
+						<h3><?php
+						/** This filter is documented in bp-xprofile/bp-xprofile-template.php */
+						echo esc_html( apply_filters( 'bp_get_the_profile_group_name', $group->name ) );
+						?></h3>
 					</noscript>
 
 					<div id="tabs-<?php echo esc_attr( $group->id ); ?>" class="tab-wrapper">
@@ -164,12 +170,18 @@ function xprofile_admin_screen( $message = '', $type = 'error' ) {
 
 						<?php if ( ! empty( $group->description ) ) : ?>
 
-							<p><?php echo esc_html( $group->description ); ?></p>
+							<p><?php
+							/** This filter is documented in bp-xprofile/bp-xprofile-template.php */
+							echo esc_html( apply_filters( 'bp_get_the_profile_group_description', $group->description ) );
+							?></p>
 
 						<?php endif; ?>
 
 						<fieldset id="<?php echo esc_attr( $group->id ); ?>" class="connectedSortable field-group">
-							<legend class="screen-reader-text"><?php printf( esc_html__( 'Fields for "%s" Group', 'buddypress' ), $group->name ); ?></legend>
+							<legend class="screen-reader-text"><?php
+							/** This filter is documented in bp-xprofile/bp-xprofile-template.php */
+							printf( esc_html__( 'Fields for "%s" Group', 'buddypress' ), apply_filters( 'bp_get_the_profile_group_name', $group->name ) );
+							?></legend>
 
 							<?php
 
diff --git a/src/bp-xprofile/bp-xprofile-filters.php b/src/bp-xprofile/bp-xprofile-filters.php
index 7918dd7..55d6e1e 100644
--- a/src/bp-xprofile/bp-xprofile-filters.php
+++ b/src/bp-xprofile/bp-xprofile-filters.php
@@ -59,11 +59,15 @@ add_filter( 'xprofile_filtered_data_value_before_save', 'trim', 2 );
 add_filter( 'xprofile_group_name_before_save',        'wp_filter_kses' );
 add_filter( 'xprofile_group_description_before_save', 'wp_filter_kses' );
 
+add_filter( 'xprofile_group_name_before_save',         'stripslashes' );
+add_filter( 'xprofile_group_description_before_save',  'stripslashes' );
+
 // Save fields
 add_filter( 'xprofile_field_name_before_save',         'wp_filter_kses' );
 add_filter( 'xprofile_field_type_before_save',         'wp_filter_kses' );
 add_filter( 'xprofile_field_description_before_save',  'wp_filter_kses' );
 add_filter( 'xprofile_field_order_by_before_save',     'wp_filter_kses' );
+
 add_filter( 'xprofile_field_is_required_before_save',  'absint' );
 add_filter( 'xprofile_field_field_order_before_save',  'absint' );
 add_filter( 'xprofile_field_option_order_before_save', 'absint' );
diff --git a/src/bp-xprofile/classes/class-bp-xprofile-group.php b/src/bp-xprofile/classes/class-bp-xprofile-group.php
index 29ed64d..689278a 100644
--- a/src/bp-xprofile/classes/class-bp-xprofile-group.php
+++ b/src/bp-xprofile/classes/class-bp-xprofile-group.php
@@ -141,7 +141,7 @@ class BP_XProfile_Group {
 		$query = $wpdb->query( $sql );
 
 		// Bail if query fails
-		if ( empty( $query ) || is_wp_error( $query ) ) {
+		if ( $query === false || is_wp_error( $query ) ) {
 			return false;
 		}