diff --git a/build/scripts/layouts.gant b/build/scripts/layouts.gant
index a8d23b4de88b..7d8cc30070c0 100644
--- a/build/scripts/layouts.gant
+++ b/build/scripts/layouts.gant
@@ -18,7 +18,9 @@ import static org.jetbrains.jps.idea.IdeaProjectLoader.guessHome
 includeTargets << new File("${guessHome(this)}/build/scripts/utils.gant")
 
 target('default': "Developers update") {
-  loadProjectFromPath(home)
+  //when IDEA CE is updated from IDEA UE sources project should be loaded from IDEA UE directory
+  String projectHome = isDefined("devIdeaHome") ? devIdeaHome : home
+  loadProjectFromPath(projectHome)
   def patchedDescriptorDir = patchAppDescriptor(deploy)
   layoutFull(home, deploy, patchedDescriptorDir)
   ant.delete(dir: patchedDescriptorDir)
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java
index 46ea7dabbabb..b2817b0786e4 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/completion/CompletionUtil.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -256,6 +256,9 @@ public class CompletionUtil {
 
   public static LinkedHashSet<String> sortMatching(final PrefixMatcher matcher, Collection<String> _names) {
     ProgressManager.checkCanceled();
+    if (matcher.getPrefix().isEmpty()) {
+      return ContainerUtil.newLinkedHashSet(_names);
+    }
 
     List<String> sorted = new ArrayList<String>();
     for (String name : _names) {
diff --git a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
index c175135417be..2b41c5b71f8a 100644
--- a/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
+++ b/platform/lang-impl/src/com/intellij/ide/actions/SearchEverywherePsiRenderer.java
@@ -89,7 +89,7 @@ class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiElement>
     if (in) text = text.substring(3);
     final FontMetrics fm = myList.getFontMetrics(myList.getFont());
     final int maxWidth = myList.getWidth() - fm.stringWidth(name) - 16 - myRightComponentWidth - 20;
-    String left = "(" + (in ? "in " : " ");
+    String left = in ? "(in " : "(";
     String right = ")";
 
     if (fm.stringWidth(left + text + right) < maxWidth) return left + text + right;
@@ -148,7 +148,7 @@ class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiElement>
     SimpleTextAttributes nameAttributes = attributes != null ? SimpleTextAttributes.fromTextAttributes(attributes) : null;
 
     Color color = list.getForeground();
-    if (nameAttributes == null) nameAttributes = new SimpleTextAttributes(Font.PLAIN, color);
+    if (nameAttributes == null) nameAttributes = new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, color);
 
     renderer.append(item + " ", nameAttributes);
     ItemPresentation itemPresentation = item.getPresentation();
@@ -157,7 +157,7 @@ class SearchEverywherePsiRenderer extends PsiElementListCellRenderer<PsiElement>
 
     String locationString = itemPresentation.getLocationString();
     if (!StringUtil.isEmpty(locationString)) {
-      renderer.append(locationString, new SimpleTextAttributes(Font.PLAIN, JBColor.GRAY));
+      renderer.append(locationString, new SimpleTextAttributes(SimpleTextAttributes.STYLE_PLAIN, JBColor.GRAY));
     }
     return true;
   }