diff --git a/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/ExportService.java b/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/ExportService.java
index 1cc769ecb..f511cb55a 100644
--- a/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/ExportService.java
+++ b/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/ExportService.java
@@ -263,7 +263,7 @@ public List<GeneTableEntry> exportGeneTable (
    */
 	public String exportGenomapXML ( 
 		String apiUrl, List<ONDEXConcept> genes, Set<ONDEXConcept> userGenes, List<String> userQtlStr,
-		String keyword, int maxGenes, Map<ONDEXConcept, Double> scoredCandidates
+		String keyword, int maxGenes, Map<ONDEXConcept, Double> scoredGeneCandidates
 	)
 	{
 		log.info ( "Genomaps: generating XML..." );
@@ -351,8 +351,8 @@ else if ( id > size / 3 && id <= 2 * size / 3 )
 			
 			// Add 'score' tag as well.
 			Double score = 0.0;
-			if ( scoredCandidates != null && scoredCandidates.get ( gene ) != null )
-				score = scoredCandidates.get ( gene ); // fetch score
+			if ( scoredGeneCandidates != null && scoredGeneCandidates.get ( gene ) != null )
+				score = scoredGeneCandidates.get ( gene ); // fetch score
 			
 			sb.append ( "<score>" + score + "</score>\n" ); // score
 			sb.append ( "</feature>\n" );
diff --git a/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/SearchService.java b/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/SearchService.java
index b641769a3..3eefeb673 100644
--- a/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/SearchService.java
+++ b/server-datasource-ondexlocal/src/main/java/rres/knetminer/datasource/ondexlocal/service/SearchService.java
@@ -476,8 +476,7 @@ public Set<QTL> searchQTLsForTraitOld ( String keyword ) throws ParseException
   }
 	
 	/**
-	 * TODO: this is the new version, which uses the new model gene->pheno->Trait, to be 
-	 * tested and activated when switching to the new test dataset.
+	 * This is the new version, which uses the new model gene->pheno->Trait.
 	 * 
 	 * TODO: wrap the exception
 	 */