diff --git a/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java b/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
index 1e44d00cd29640fb893556c0c72aa975cd111286..cea055fed684b8e064c693b2be31e6b55c2869c1 100644
--- a/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
+++ b/src/fr/inrialpes/exmo/align/cli/ParserPrinter.java
@@ -209,6 +209,7 @@ public class ParserPrinter {
 	    	 File f = new File(dirName);
              f.mkdir();
 	    	System.setProperty("user.dir", dirName);
+	    	System.setProperty("Split", "true");
 	    }
 	    writer = new PrintWriter (
 			  new BufferedWriter(
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
index 4972b3dd61fafb69b727327f8017fa7618edce08..71e1c6908a8e0536da0ebda3449cb549bda6397d 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/GraphPatternRendererVisitor.java
@@ -179,7 +179,7 @@ public abstract class GraphPatternRendererVisitor extends IndentedRendererVisito
     public void createQueryFiles(String query) {
     	BufferedWriter out = null;
     	try {
-			FileWriter writer1 = new FileWriter(new File("").getAbsolutePath()+"query"+ number +".rq");
+			FileWriter writer1 = new FileWriter(new File("").getAbsolutePath()+"/query"+ number +".rq");
 			out = new BufferedWriter(writer1);
 			number++;
 			out.write(query);
@@ -1023,13 +1023,15 @@ public abstract class GraphPatternRendererVisitor extends IndentedRendererVisito
     }
 
     public void visit( final Value e ) throws AlignmentException {
-    	String str = e.getType().toString();
-    	int index;
-    	if (str.contains("#"))
-    		index = str.lastIndexOf("#");
-    	else
-    		index = str.lastIndexOf("/");
-    	uriType = str.substring(0, index+1);
+    	if (e.getType() != null) {
+	    	String str = e.getType().toString();
+	    	int index;
+	    	if (str.contains("#"))
+	    		index = str.lastIndexOf("#");
+	    	else
+	    		index = str.lastIndexOf("/");
+	    	uriType = str.substring(0, index+1);
+    	}
     	value = e.getValue();
     }
 	
diff --git a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
index 7a6e051f597b817e9d81d0d299f0874f8ea07aea..c317a08eeb74584f8ded96246a3be53829db4da1 100644
--- a/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
+++ b/src/fr/inrialpes/exmo/align/impl/renderer/SPARQLConstructRendererVisitor.java
@@ -1,31 +1,19 @@
 package fr.inrialpes.exmo.align.impl.renderer;
 
-
+import fr.inrialpes.exmo.align.impl.edoal.Expression;
 import java.io.PrintWriter;
-
 import org.semanticweb.owl.align.Alignment;
 import org.semanticweb.owl.align.AlignmentException;
 import org.semanticweb.owl.align.AlignmentVisitor;
 import org.semanticweb.owl.align.Cell;
 import org.semanticweb.owl.align.Relation;
-
-
-import fr.inrialpes.exmo.align.impl.Annotations;
-import fr.inrialpes.exmo.align.impl.BasicAlignment;
-import fr.inrialpes.exmo.align.impl.Namespace;
-import fr.inrialpes.exmo.align.parser.SyntaxElement;
-import fr.inrialpes.exmo.align.impl.edoal.Expression;
-import fr.inrialpes.exmo.ontowrap.Ontology;
-
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Enumeration;
 import java.util.Hashtable;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Properties;
 
-
 public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor implements AlignmentVisitor{
 
 
@@ -33,9 +21,7 @@ public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor
     Cell cell = null;
     Hashtable<String,String> nslist = null;
 	boolean embedded = false;
-	
-	private static Namespace DEF = Namespace.ALIGNMENT;
-	
+		
 	private List<String> listBGP1;
 	private List<String> listBGP2;
 	 
@@ -105,8 +91,10 @@ public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor
 				query += "WHERE {"+NL;
 				query += listBGP2.get(listBGP2.size()-1)+NL;    	    		
 				query += "}"+NL;
-				indentedOutputln(query);
-	    		createQueryFiles(query);
+				if(System.getProperty("Split")=="true")
+	    			createQueryFiles(query);
+	    		else
+	    			indentedOutputln(query);
 			}
 			query="";
     		
@@ -124,8 +112,10 @@ public class SPARQLConstructRendererVisitor extends GraphPatternRendererVisitor
 				query += "WHERE {"+NL;
 				query += listBGP1.get(listBGP1.size()-1)+NL;    	    		
 				query += "}"+NL;
-				indentedOutputln(query);
-	    		createQueryFiles(query);
+				if(System.getProperty("Split")=="true")
+	    			createQueryFiles(query);
+	    		else
+	    			indentedOutputln(query);
 			}    		   	       		    	
     	}