Index: src/bp-activity/bp-activity-filters.php
===================================================================
--- src/bp-activity/bp-activity-filters.php
+++ src/bp-activity/bp-activity-filters.php
@@ -651,17 +651,36 @@
  * @return array
  */
 function bp_activity_filter_just_me_scope( $retval, $filter ) {
-	$retval = array(
-		'column' => 'user_id',
-		'value'  => $filter['user_id']
-	);
-
-	$retval['override']['display_comments'] = 'stream';
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
 
-	// wipe out the user ID
-	$retval['override']['filter']['user_id'] = 0;
+	// Should we show all items regardless of sitewide visibility?
+	$show_hidden = array();
+	if ( ! empty( $user_id ) && $user_id !== bp_loggedin_user_id() ) {
+		$show_hidden = array(
+			'column' => 'hide_sitewide',
+			'value'  => 0
+		);
+	}
 
-	return $retval;
+	return array(
+		'relation' => 'AND',
+		array(
+			'column' => 'user_id',
+			'value'  => $filter['user_id']
+		),
+		$show_hidden,
+
+		// overrides
+		'override' => array(
+			'display_comments' => 'stream',
+			'filter'           => array( 'user_id' => 0 ),
+			'show_hidden'      => true
+		),
+	);
 }
 add_filter( 'bp_activity_set_just-me_scope_args', 'bp_activity_filter_just_me_scope', 10, 2 );
 
@@ -675,22 +694,42 @@
  * @return array
  */
 function bp_activity_filter_favorites_scope( $retval, $filter ) {
-	$favs = bp_activity_get_user_favorites( $filter['user_id'] );
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
+
+	$favs = bp_activity_get_user_favorites( $user_id );
 	if ( empty( $favs ) ) {
 		$favs = array( 0 );
 	}
 
-	$retval = array(
-		'column'  => 'id',
-		'compare' => 'IN',
-		'value'   => (array) $favs
-	);
-	$retval['override']['display_comments']  = true;
-
-	// wipe out the user ID
-	$retval['override']['filter']['user_id'] = 0;
+	// Should we show all items regardless of sitewide visibility?
+	$show_hidden = array();
+	if ( ! empty( $user_id ) && $user_id !== bp_loggedin_user_id() ) {
+		$show_hidden = array(
+			'column' => 'hide_sitewide',
+			'value'  => 0
+		);
+	}
 
-	return $retval;
+	return array(
+		'relation' => 'AND',
+		array(
+			'column'  => 'id',
+			'compare' => 'IN',
+			'value'   => (array) $favs
+		),
+		$show_hidden,
+
+		// overrides
+		'override' => array(
+			'display_comments' => true,
+			'filter'           => array( 'user_id' => 0 ),
+			'show_hidden'      => true
+		),
+	);
 }
 add_filter( 'bp_activity_set_favorites_scope_args', 'bp_activity_filter_favorites_scope', 10, 2 );
 
@@ -710,21 +749,42 @@
 		return $retval;
 	}
 
-	$retval = array(
-		'column'  => 'content',
-		'compare' => 'LIKE',
-
-		// Start search at @ symbol and stop search at closing tag delimiter.
-		'value'   => '@' . bp_activity_get_user_mentionname( $filter['user_id'] ) . '<'
-	);
-
-	// wipe out current search terms if any
-	// this is so the 'mentions' scope can be combined with other scopes
-	$retval['override']['search_terms'] = false;
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
 
-	$retval['override']['display_comments'] = 'stream';
-	$retval['override']['filter']['user_id'] = 0;
+	// Should we show all items regardless of sitewide visibility?
+	$show_hidden = array();
+	if ( ! empty( $user_id ) && $user_id !== bp_loggedin_user_id() ) {
+		$show_hidden = array(
+			'column' => 'hide_sitewide',
+			'value'  => 0
+		);
+	}
 
-	return $retval;
+	return array(
+		'relation' => 'AND',
+		array(
+			'column'  => 'content',
+			'compare' => 'LIKE',
+
+			// Start search at @ symbol and stop search at closing tag delimiter.
+			'value'   => '@' . bp_activity_get_user_mentionname( $user_id ) . '<'
+		),
+		$show_hidden,
+
+		// overrides
+		'override' => array(
+			// wipe out current search terms if any
+			// this is so the 'mentions' scope can be combined with other scopes
+			'search_terms' => false,
+
+			'display_comments' => 'stream',
+			'filter'           => array( 'user_id' => 0 ),
+			'show_hidden'      => true
+		),
+	);
 }
 add_filter( 'bp_activity_set_mentions_scope_args', 'bp_activity_filter_mentions_scope', 10, 2 );
Index: src/bp-activity/bp-activity-template.php
===================================================================
--- src/bp-activity/bp-activity-template.php
+++ src/bp-activity/bp-activity-template.php
@@ -622,19 +622,6 @@
 	if ( empty( $search_terms ) && ! empty( $_REQUEST['s'] ) )
 		$search_terms = $_REQUEST['s'];
 
-	// Set some default arguments when using a scope
-	if ( ! empty( $scope ) ) {
-		// Determine which user ID applies
-		if ( empty( $user_id ) ) {
-			$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
-		}
-
-		// Should we show all items regardless of sitewide visibility?
-		if ( ! empty( $user_id ) ) {
-			$show_hidden = ( $user_id == bp_loggedin_user_id() ) ? 1 : 0;
-		}
-	}
-
 	// Do not exceed the maximum per page
 	if ( !empty( $max ) && ( (int) $per_page > (int) $max ) )
 		$per_page = $max;
Index: src/bp-friends/bp-friends-activity.php
===================================================================
--- src/bp-friends/bp-friends-activity.php
+++ src/bp-friends/bp-friends-activity.php
@@ -239,13 +239,19 @@
  * @return array
  */
 function bp_friends_filter_activity_scope( $retval, $filter ) {
-	$friends = friends_get_friend_user_ids( $filter['user_id'] );
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
+
+	$friends = friends_get_friend_user_ids( $user_id );
 
 	if ( empty( $friends ) ) {
 		$friends = array( 0 );
 	}
 
-	$retval= array(
+	return array(
 		'relation' => 'AND',
 		array(
 			'column'  => 'user_id',
@@ -257,16 +263,13 @@
 			'column' => 'hide_sitewide',
 			'value'  => 0
 		),
-	);
-
-	// wipe out the user ID
-	$retval['override']['filter']['user_id'] = 0;
-
-	// make sure we aren't limiting items by 'hide_sitewide' since we're already
-	// limiting it above
-	$retval['override']['show_hidden'] = true;
 
-	return $retval;
+		// overrides
+		'override' => array(
+			'filter'      => array( 'user_id' => 0 ),
+			'show_hidden' => true
+		),
+	);
 }
 add_filter( 'bp_activity_set_friends_scope_args', 'bp_friends_filter_activity_scope', 10, 2 );
 
@@ -282,6 +285,12 @@
  * @return array
  */
 function bp_friends_filter_activity_just_me_scope( $retval, $filter ) {
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
+
 	// Get the requested action
 	$action = $filter['filter']['action'];
 
@@ -300,17 +309,21 @@
 		return $retval;
 	}
 
+	// Save existing override value
+	$override = array();
+	if ( ! empty( $retval['override'] ) ) {
+		$override = $retval['override'];
+		unset( $retval['override'] );
+	}
+
 	/**
 	 * Else make sure to get the friendship_created action, the user is involved in
 	 * - user initiated the friendship
 	 * - user has been requested a friendship
 	 */
-	return array(
+	$retval = array(
 		'relation' => 'OR',
-		array(
- 			'column' => 'user_id',
- 			'value'  => $filter['user_id']
- 		),
+		$retval,
 		array(
 			'relation' => 'AND',
 			array(
@@ -319,14 +332,17 @@
 			),
 			array(
 				'column' => 'secondary_item_id',
-				'value'  => $filter['user_id'],
+				'value'  => $user_id,
 			),
-		),
-		'override' => array(
-			'display_comments' => 'stream',
-			'filter'           => array( 'user_id' => 0 ),
-		),
+		)
 	);
+
+	// Add back override value
+	if ( ! empty( $override ) ) {
+		$retval['override'] = $override;
+	}
+
+	return $retval;
 }
 add_filter( 'bp_activity_set_just-me_scope_args', 'bp_friends_filter_activity_just_me_scope', 20, 2 );
 
Index: src/bp-groups/bp-groups-activity.php
===================================================================
--- src/bp-groups/bp-groups-activity.php
+++ src/bp-groups/bp-groups-activity.php
@@ -243,29 +243,48 @@
  * @return array
  */
 function bp_groups_filter_activity_scope( $retval, $filter ) {
-	$groups = groups_get_user_groups( $filter['user_id'] );
+	if ( ! empty( $filter['user_id'] ) ) {
+		$user_id = $filter['user_id'];
+	} else {
+		$user_id = bp_displayed_user_id() ? bp_displayed_user_id() : bp_loggedin_user_id();
+	}
 
+	$groups = groups_get_user_groups( $user_id );
 	if ( empty( $groups['groups'] ) ) {
 		$groups = array( 'groups' => 0 );
 	}
 
-	$retval= array(
+	// Should we show all items regardless of sitewide visibility?
+	$show_hidden = array();
+	if ( ! empty( $user_id ) && $user_id !== bp_loggedin_user_id() ) {
+		$show_hidden = array(
+			'column' => 'hide_sitewide',
+			'value'  => 0
+		);
+	}
+
+	return array(
 		'relation' => 'AND',
 		array(
-			'column' => 'component',
-			'value'  => buddypress()->groups->id
+			'relation' => 'AND',
+			array(
+				'column' => 'component',
+				'value'  => buddypress()->groups->id
+			),
+			array(
+				'column'  => 'item_id',
+				'compare' => 'IN',
+				'value'   => (array) $groups['groups']
+			),
 		),
-		array(
-			'column'  => 'item_id',
-			'compare' => 'IN',
-			'value'   => (array) $groups['groups']
+		$show_hidden,
+
+		// overrides
+		'override' => array(
+			'filter'      => array( 'user_id' => 0 ),
+			'show_hidden' => true
 		),
 	);
-
-	// wipe out the user ID
-	$retval['override']['filter']['user_id'] = 0;
-
-	return $retval;
 }
 add_filter( 'bp_activity_set_groups_scope_args', 'bp_groups_filter_activity_scope', 10, 2 );