--- class-wp-ms-sites-list-table.php (36416)
+++ class-wp-ms-sites-list-table.php (working copy)
@@ -115,17 +115,17 @@
 		} else {
 			if ( is_numeric($s) && empty( $wild ) ) {
 				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.blog_id = %s )", $s );
-			} elseif ( is_subdomain_install() ) {
-				$blog_s = str_replace( '.' . $current_site->domain, '', $s );
-				$blog_s = $wpdb->esc_like( $blog_s ) . $wild . $wpdb->esc_like( '.' . $current_site->domain );
-				$query .= $wpdb->prepare( " AND ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
 			} else {
+				$blog_s = $wpdb->esc_like( $s ) . $wild;
+				$query .= $wpdb->prepare( " AND ( ( {$wpdb->blogs}.domain LIKE %s ) ", $blog_s );
+
 				if ( $s != trim('/', $current_site->path) ) {
 					$blog_s = $wpdb->esc_like( $current_site->path . $s ) . $wild . $wpdb->esc_like( '/' );
 				} else {
 					$blog_s = $wpdb->esc_like( $s );
 				}
-				$query .= $wpdb->prepare( " AND  ( {$wpdb->blogs}.path LIKE %s )", $blog_s );
+
+				$query .= $wpdb->prepare( " OR ( {$wpdb->blogs}.path LIKE %s ) )", $blog_s );
 			}
 		}