Index: wp-admin/includes/ajax-actions.php
===================================================================
--- wp-admin/includes/ajax-actions.php	(revision 20993)
+++ wp-admin/includes/ajax-actions.php	(working copy)
@@ -219,17 +219,38 @@
 	$return = array();
 
 	global $wpdb;
-	$like_escaped_term = '%' . like_escape( stripslashes( $_REQUEST['term'] ) ) . '%';
-	$sites = $wpdb->get_results( $wpdb->prepare( "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE ( domain LIKE %s OR path LIKE %s ) AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC", $like_escaped_term, $like_escaped_term ), ARRAY_A );
+    $value = stripslashes( $_REQUEST['term'] );
+    $terms = explode( '/', $value );    
+    
+    $like_sql = "( domain LIKE %s OR path LIKE %s )";
+    $likes = array();
+    $like_escaped_terms = array();
+    
+    $join = ' OR ';
+    foreach ( $terms as $term ) {
+        if ( !empty( $likes ) )
+            $join = ' AND ';
+        
+        $escaped = '%' . like_escape( $term ) . '%';
+        $like_escaped_terms[] = $escaped;
+        $like_escaped_terms[] = $escaped;
+        array_push( $likes, $like_sql );
+    }  
 
+    $select = "SELECT blog_id, domain, path FROM $wpdb->blogs WHERE ( " . join( $join, $likes ) . " ) AND public = '1' AND archived = '0' AND mature = '0' AND spam = '0' AND deleted = '0' ORDER BY registered DESC";
+    array_unshift( $like_escaped_terms, $select );
+    $sql = call_user_func_array( array( $wpdb, 'prepare' ), $like_escaped_terms );
+
+	$sites = $wpdb->get_results( $sql, ARRAY_A );
+
 	if ( empty( $sites ) )
 		wp_die( -1 );
 
 	foreach ( (array) $sites as $details ) {
-		$blogname = get_blog_option( $details['blog_id'], 'blogname' );
+        $domain = is_subdomain_install() ? $details['domain'] : $details['path'];
 		$return[] = array(
-			'label' => sprintf( '%1$s (%2$s)', $blogname, $details['domain'] . $details['path'] ),
-			'value' => $details['domain']
+			'label' => $domain,
+			'value' => str_replace( '/', '', $domain )
 		);
 	}