diff --git a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
index fe2b2937aad..719db9d89b8 100644
--- a/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
+++ b/src/vs/workbench/api/node/extHostDocumentContentProviders.ts
@@ -32,6 +32,8 @@ export class ExtHostDocumentContentProvider implements ExtHostDocumentContentPro
 	}
 
 	registerTextDocumentContentProvider(scheme: string, provider: vscode.TextDocumentContentProvider): vscode.Disposable {
+		// todo@remote
+		// check with scheme from fs-providers!
 		if (scheme === 'file' || scheme === 'untitled') {
 			throw new Error(`scheme '${scheme}' already registered`);
 		}
diff --git a/src/vs/workbench/api/node/extHostDocumentData.ts b/src/vs/workbench/api/node/extHostDocumentData.ts
index 20c9fe31052..2be3ac6908d 100644
--- a/src/vs/workbench/api/node/extHostDocumentData.ts
+++ b/src/vs/workbench/api/node/extHostDocumentData.ts
@@ -68,6 +68,8 @@ export class ExtHostDocumentData extends MirrorTextModel {
 			this._document = {
 				get uri() { return data._uri; },
 				get fileName() { return data._uri.fsPath; },
+				// todo@remote
+				// documents from other fs-provider must not be untitled
 				get isUntitled() { return data._uri.scheme !== 'file'; },
 				get languageId() { return data._languageId; },
 				get version() { return data._versionId; },
diff --git a/src/vs/workbench/services/search/node/searchService.ts b/src/vs/workbench/services/search/node/searchService.ts
index b6307b38dd4..8284c0f6c74 100644
--- a/src/vs/workbench/services/search/node/searchService.ts
+++ b/src/vs/workbench/services/search/node/searchService.ts
@@ -158,6 +158,9 @@ export class SearchService implements ISearchService {
 				}
 
 				// Don't support other resource schemes than files for now
+				// todo@remote
+				// why is that? we should search for resources from other
+				// schemes
 				else if (resource.scheme !== 'file') {
 					return;
 				}