diff --git src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
index 20441b2f3..82b825575 100644
--- src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
+++ src/bp-templates/bp-nouveau/buddypress/common/search-and-filters-bar.php
@@ -8,10 +8,10 @@
 ?>
 <div class="subnav-filters filters no-ajax" id="subnav-filters">
 
-	<?php if ( 'friends' !== bp_current_component() ) : ?>
+	<?php if ( bp_nouveau_get_component_slug( 'friends' ) !== bp_current_component() ) : ?>
 	<div class="subnav-search clearfix">
 
-		<?php if ( 'activity' === bp_current_component() ) : ?>
+		<?php if ( bp_nouveau_get_component_slug( 'activity' ) === bp_current_component() ) : ?>
 			<div class="feed"><a href="<?php bp_sitewide_activity_feed_link(); ?>" class="bp-tooltip" data-bp-tooltip="<?php esc_attr_e( 'RSS Feed', 'buddypress' ); ?>"><span class="bp-screen-reader-text"><?php esc_html_e( 'RSS', 'buddypress' ); ?></span></a></div>
 		<?php endif; ?>
 
@@ -22,7 +22,7 @@
 
 		<?php if ( bp_is_user() && ! bp_is_current_action( 'requests' ) ) : ?>
 			<?php bp_get_template_part( 'common/filters/user-screens-filters' ); ?>
-		<?php elseif ( 'groups' === bp_current_component() ) : ?>
+		<?php elseif ( bp_nouveau_get_component_slug( 'groups' ) === bp_current_component() ) : ?>
 			<?php bp_get_template_part( 'common/filters/groups-screens-filters' ); ?>
 		<?php else : ?>
 			<?php bp_get_template_part( 'common/filters/directory-filters' ); ?>
diff --git src/bp-templates/bp-nouveau/includes/functions.php src/bp-templates/bp-nouveau/includes/functions.php
index a4cd20aa8..305b3d664 100644
--- src/bp-templates/bp-nouveau/includes/functions.php
+++ src/bp-templates/bp-nouveau/includes/functions.php
@@ -535,7 +535,7 @@ function bp_nouveau_get_component_filters( $context = '', $component = '' ) {
 		if ( 'directory' === $context || 'user' === $context ) {
 			$component = bp_current_component();
 
-			if ( 'friends' === $component ) {
+			if ( bp_nouveau_get_component_slug( 'friends' ) === $component ) {
 				$context   = 'friends';
 				$component = 'members';
 			}
@@ -550,16 +550,16 @@ function bp_nouveau_get_component_filters( $context = '', $component = '' ) {
 		return $filters;
 	}
 
-	if ( 'members' === $component ) {
+	if ( bp_nouveau_get_component_slug( 'members' ) === $component ) {
 		$filters = bp_nouveau_get_members_filters( $context );
-	} elseif ( 'activity' === $component ) {
+	} elseif ( bp_nouveau_get_component_slug( 'activity' ) === $component ) {
 		$filters = bp_nouveau_get_activity_filters();
 
 		// Specific case for the activity dropdown
 		$filters = array_merge( array( '-1' => __( '&mdash; Everything &mdash;', 'buddypress' ) ), $filters );
-	} elseif ( 'groups' === $component ) {
+	} elseif ( bp_nouveau_get_component_slug( 'groups' ) === $component ) {
 		$filters = bp_nouveau_get_groups_filters( $context );
-	} elseif ( 'blogs' === $component ) {
+	} elseif ( bp_nouveau_get_component_slug( 'blogs' ) === $component ) {
 		$filters = bp_nouveau_get_blogs_filters( $context );
 	}
 
@@ -1377,3 +1377,23 @@ function bp_nouveau_set_nav_item_order( $nav = null, $order = array(), $parent_s
 
 	return true;
 }
+
+function bp_nouveau_get_component_slug( $component_id = '' ) {
+	$slug = '';
+
+	if ( ! $component_id ) {
+		return $slug;
+	}
+
+	$component_id = sanitize_key( $component_id );
+
+	if ( bp_is_active( $component_id ) ) {
+		$slug = call_user_func( 'bp_get_' . $component_id . '_slug' );
+	} elseif ( defined( 'BP_' . strtoupper( $component_id ) . '_SLUG' ) ) {
+		$slug = constant( 'BP_' . strtoupper( $component_id ) . '_SLUG' );
+	} else {
+		$slug = $component_id;
+	}
+
+	return $slug;
+}
diff --git src/bp-templates/bp-nouveau/includes/template-tags.php src/bp-templates/bp-nouveau/includes/template-tags.php
index 8662aa552..bd5d6524f 100644
--- src/bp-templates/bp-nouveau/includes/template-tags.php
+++ src/bp-templates/bp-nouveau/includes/template-tags.php
@@ -1989,8 +1989,12 @@ function bp_nouveau_current_object() {
 
 	} else {
 		$data_filter = bp_current_component();
-		if ( 'friends' === $data_filter && bp_is_user_friend_requests() ) {
-			$data_filter = 'friend_requests';
+		if ( bp_nouveau_get_component_slug( 'friends' ) === $data_filter ) {
+			$data_filter = 'friends';
+
+			if ( bp_is_user_friend_requests() ) {
+				$data_filter = 'friend_requests';
+			}
 		}
 
 		$component['members_select']   = 'members-order-select';
@@ -2022,12 +2026,12 @@ function bp_nouveau_filter_container_id() {
 		$component = bp_nouveau_current_object();
 
 		$ids = array(
-			'members'       =>  $component['members_select'],
-			'friends'       => 'members-friends-select',
-			'notifications' => 'notifications-filter-select',
-			'activity'      => 'activity-filter-select',
-			'groups'        => 'groups-order-select',
-			'blogs'         => 'blogs-order-select',
+			bp_nouveau_get_component_slug( 'members' )       =>  $component['members_select'],
+			bp_nouveau_get_component_slug( 'friends' )       => 'members-friends-select',
+			bp_nouveau_get_component_slug( 'notifications' ) => 'notifications-filter-select',
+			bp_nouveau_get_component_slug( 'activity' )      => 'activity-filter-select',
+			bp_nouveau_get_component_slug( 'groups' )        => 'groups-order-select',
+			bp_nouveau_get_component_slug( 'blogs' )         => 'blogs-order-select',
 		);
 
 		if ( isset( $ids[ $component['object'] ] ) ) {
@@ -2065,12 +2069,12 @@ function bp_nouveau_filter_id() {
 		$component = bp_nouveau_current_object();
 
 		$ids = array(
-			'members'       => $component['members_order_by'],
-			'friends'       => 'members-friends',
-			'notifications' => 'notifications-filter-by',
-			'activity'      => 'activity-filter-by',
-			'groups'        => 'groups-order-by',
-			'blogs'         => 'blogs-order-by',
+			bp_nouveau_get_component_slug( 'members' )       => $component['members_order_by'],
+			bp_nouveau_get_component_slug( 'friends' )       => 'members-friends',
+			bp_nouveau_get_component_slug( 'notifications' ) => 'notifications-filter-by',
+			bp_nouveau_get_component_slug( 'activity' )      => 'activity-filter-by',
+			bp_nouveau_get_component_slug( 'groups' )        => 'groups-order-by',
+			bp_nouveau_get_component_slug( 'blogs' )         => 'blogs-order-by',
 		);
 
 		if ( isset( $ids[ $component['object'] ] ) ) {
@@ -2108,7 +2112,7 @@ function bp_nouveau_filter_label() {
 		$component = bp_nouveau_current_object();
 		$label     = __( 'Order By:', 'buddypress' );
 
-		if ( 'activity' === $component['object'] || 'friends' === $component['object'] ) {
+		if ( bp_nouveau_get_component_slug( 'activity' ) === $component['object'] || bp_nouveau_get_component_slug( 'friends' ) === $component['object'] ) {
 			$label = __( 'Show:', 'buddypress' );
 		}
 
@@ -2152,7 +2156,7 @@ function bp_nouveau_filter_options() {
 	function bp_nouveau_get_filter_options() {
 		$output = '';
 
-		if ( 'notifications' === bp_current_component() ) {
+		if ( bp_nouveau_get_component_slug( 'notifications' ) === bp_current_component() ) {
 			$output = bp_nouveau_get_notifications_filters();
 
 		} else {