diff --git a/default/queries/q0301.rq b/default/queries/q0301.rq
index 96e0e132..4d96a24a 100644
--- a/default/queries/q0301.rq
+++ b/default/queries/q0301.rq
@@ -15,3 +15,8 @@ select ?subSpecies   where {
 #  * -> means 0 or more
 #  + -> means 1 or more
 #  ? -> means 0 or 1 
+
+# The same can be used for any property for example:
+# select ?parents where {
+#	ttr:Eve dbo:parent+ ?parents .
+# }
\ No newline at end of file
diff --git a/default/queries/q0400.rq b/default/queries/q0400.rq
index 9d97137a..1db7fe1f 100644
--- a/default/queries/q0400.rq
+++ b/default/queries/q0400.rq
@@ -1,11 +1,12 @@
 #title:Search for lonely pets and try to find them a nice owner :)
 
 #comment: Insert the triplet using the data tab (you must run the web application locally)
-#This query shows pet without owners
+#This query shows pets with their owners if it exists
 #img:link-data
 
 #dbpedia:Harrison_Ford tto:pet ttr:SnuffMonkey.
 select ?pet ?owner where {
   ?pet a / rdfs:subClassOf+ tto:Animal .
-  filter not exists {?owner tto:pet ?pet}
-}
\ No newline at end of file
+  optional {?owner tto:pet ?pet}
+}
+
diff --git a/sparql-playground.war b/sparql-playground.war
index 95b76130..248504cc 100644
Binary files a/sparql-playground.war and b/sparql-playground.war differ
diff --git a/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java b/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java
index d328befe..cf781ccf 100644
--- a/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java
+++ b/src/main/java/ch/isb/sib/sparql/tutorial/controller/SparqlController.java
@@ -1,6 +1,9 @@
 package ch.isb.sib.sparql.tutorial.controller;
 
 import java.io.IOException;
+import java.net.InetAddress;
+import java.net.NetworkInterface;
+import java.net.SocketException;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
@@ -49,10 +52,10 @@ public void sparqlData(HttpServletResponse response) throws QueryEvaluationExcep
 	@RequestMapping(value = "/ttl-data", method = RequestMethod.PUT)
 	public long sparqlData(@RequestParam(value = "data", required = true) String data, HttpServletRequest request) throws QueryEvaluationException, Exception {
 
-		if("localhost".equals(request.getLocalName())){
-			return sparqlService.loadData(data);
+		if((System.getProperty("reload") != null) && (System.getProperty("reload").equalsIgnoreCase("false"))){ //check if loading data is not allowed
+			throw new SparqlTutorialException("You must run the application in localhost in order to load data. Download it by clicking on the link below the page");
 		}else {
-			throw new SparqlTutorialException("You must run the application in localhost in order to load data. Download it on GitHub by following the link 'For Developers'");
+			return sparqlService.loadData(data);
 		}
 	}