diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
index 3a2aeda6d45..f6646cd8647 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/DOMCompletionContributor.java
@@ -140,8 +140,8 @@ public class DOMCompletionContributor implements ICompletionContributor {
                     dispargs.append(',');
                     idargs.append(',');
                 }
-                dispargs.append(" ..."); //$NON-NLS-1$
-                idargs.append(" ..."); //$NON-NLS-1$
+                dispargs.append("..."); //$NON-NLS-1$
+                idargs.append("..."); //$NON-NLS-1$
 			} else if (params.length == 0) { // force the void in
 			    dispargs.append("void"); //$NON-NLS-1$
                 idargs.append("void"); //$NON-NLS-1$
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
index 72e74fef955..d427a36ac79 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/SearchCompletionContributor.java
@@ -49,8 +49,7 @@ public class SearchCompletionContributor implements ICompletionContributor {
 				
 		// Create search scope
 		ICElement[] projects = new ICElement[] { workingCopy.getCProject() };
-		//ICSearchScope scope = SearchEngine.createCSearchScope(projects, true);
-        ICSearchScope scope = SearchEngine.createWorkspaceScope();
+		ICSearchScope scope = SearchEngine.createCSearchScope(projects, true);
 			
 		// Create the pattern
 		ICSearchPattern pattern = SearchEngine.createSearchPattern(prefix + "*", ICSearchConstants.UNKNOWN_SEARCH_FOR, ICSearchConstants.ALL_OCCURRENCES, true); //$NON-NLS-1$