diff --git a/app/node-app/app.js b/app/node-app/app.js
index 1758c90eb432a5150024a5466bc3e6bc0aadc078..e9ea35d83830fe29c784a22342688c10c3140594 100644
--- a/app/node-app/app.js
+++ b/app/node-app/app.js
@@ -7,7 +7,7 @@ var bodyParser = require('body-parser');
 
 var mongo = require('mongodb');
 var mongojs = require('mongojs')
-var db = mongojs('devmaster.vital-it.ch:27017/arraymap', ['samples'])
+var db = mongojs('localhost:27017/arraymap', ['samples'])
 
 //var monk = require('monk');
 //var db = monk('devmaster.vital-it.ch:27017/arraymap');
diff --git a/app/node-app/arraymap-beacon/v0.4/beacon-query.js b/app/node-app/arraymap-beacon/v0.4/beacon-query.js
index 71a81939affd78f4778329d9bdbfe8622b5228ae..afcc41f6e823e93c89632393099ba8ecef20dec4 100644
--- a/app/node-app/arraymap-beacon/v0.4/beacon-query.js
+++ b/app/node-app/arraymap-beacon/v0.4/beacon-query.js
@@ -9,9 +9,9 @@ info['info']['info']['datasets'].forEach(function(dataset){
 });
 
 var referenceMap = {
-    'GRCh38': 'SEGMENTS_HG38',
-    'GRCh37': 'SEGMENTS_HG19',
     'GRCh36': 'SEGMENTS_HG18'
+    'GRCh37': 'SEGMENTS_HG19',
+    'GRCh38': 'SEGMENTS_HG38',
 };
 
 //correspondence to arraymap class
@@ -21,8 +21,8 @@ var alternateBasesMap = {
 };
 
 // By default doe Maximilien takes Reference 37. https://github.com/maximilianh/ucscBeacon/blob/master/help.txt
-//TODO Should it be the same as Maximilen? Is it specified by beacon documentaiton?    
-var defaultReference = 'GRCh38';
+//TODO Should it be the same as Maximilen? Is it specified by beacon documentaiton?
+var defaultReference = 'GRCh36';
 
 function checkPreconditions(params) {
 
@@ -339,4 +339,4 @@ function checkDatasetIdentifiers(userDatasetIdentifiers, allDatasetIdentifiers)
 
 module.exports.checkPreconditions = checkPreconditions;
 module.exports.buildMongoQuery = buildMongoQuery;
-module.exports.checkResultAndGetResponse = checkResultAndGetResponse;
\ No newline at end of file
+module.exports.checkResultAndGetResponse = checkResultAndGetResponse;