diff --git a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
index 812fe934a9a28b9c4872d871f960e024f0672782..403f55744405d4ab4921bb269e4abe39f3861adb 100644
--- a/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
+++ b/openbis_standard_technologies/dist/core-plugins/dataset-uploader/1/dss/reporting-plugins/dataset-uploader-api/dataset-uploader-api.py
@@ -31,22 +31,6 @@ import subprocess
 import os.path
 import re
 
-def getSampleByIdentifierForUpdate(tr, identifier):
-	space = identifier.split("/")[1];
-	code = identifier.split("/")[2];
-	
-	criteria = SearchCriteria();
-	criteria.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.SPACE, space));
-	criteria.addMatchClause(MatchClause.createAttributeMatch(MatchClauseAttribute.CODE, code));
-	criteria.setOperator(SearchOperator.MATCH_ALL_CLAUSES);
-	
-	searchService = tr.getSearchService();
-	found = list(searchService.searchForSamples(criteria));
-	if len(found) == 1:
-		return tr.makeSampleMutable(found[0]);
-	else:
-		raise UserFailureException(identifier + " Not found by search service.");	
-
 def username(sessiontoken):
 	m = re.compile('(.*)-[^-]*').match(sessiontoken)
 	if m:
@@ -108,7 +92,7 @@ def insertDataSet(tr, parameters, tableBuilder):
 	#Create Dataset
 	dataSet = tr.createNewDataSet(dataSetType);
 	if sampleIdentifier is not None:
-		dataSetSample = getSampleByIdentifierForUpdate(tr, sampleIdentifier);
+		dataSetSample = tr.getSampleForUpdate(sampleIdentifier);
 		dataSet.setSample(dataSetSample);
 	elif experimentIdentifier is not None:
 		dataSetExperiment = tr.getExperimentForUpdate(experimentIdentifier);