diff --git a/Makefile b/Makefile
index 9c9b3cd33380e9897bb90585cd457eb4f3de0276..625db27ebdb64d24d688c3dab73fc9c5c8202a19 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-DB_NAME=sqad_db/sqad_v3_$(shell date +"%d-%m-%Y_%H-%M-%S")
+DB_NAME=sqad_db/devel/sqad_v3_$(shell date +"%d-%m-%Y_%H-%M-%S")
 create:
 	printf "SQAD to DB\n=======================" >> $(DB_NAME).log
 	./sqad2database.py -p /nlp/projekty/sqad/sqad_v3/data -n $(DB_NAME) 2>> $(DB_NAME).log
@@ -11,7 +11,7 @@ create:
 	printf "Context previous sentece\n======================" >> $(DB_NAME).log
 	./context_previous_senteces.py -d $(DB_NAME) 2>> $(DB_NAME).log
 	printf "Context wiki entity\n======================" >> $(DB_NAME).log
-	python ./context_ner.py -d $(DB_NAME) -m named_entity_recognition/BERT-NER/ner_model_cz/ 2>> $(DB_NAME).log
+	conda activate mypy3; python ./context_ner.py -d $(DB_NAME) -m named_entity_recognition/BERT-NER/ner_model_cz/ 2>> $(DB_NAME).log
 
 run_ZODB_server:
-	cd "$(HOME)/.local/lib/python3.6/site-packages/"; exec "/usr/bin/python3.6" -m "ZEO.runzeo" -a "0.0.0.0:9001" -f "/nlp/projekty/question_answering/AQA_v2/sqad_tools/sqad2database/sqad_db/sqad_v3_30-09-2020_11-31-38"
+	cd "$(HOME)/.local/lib/python3.6/site-packages/"; exec "/usr/bin/python3.6" -m "ZEO.runzeo" -a "0.0.0.0:9001" -f "/nlp/projekty/question_answering/AQA_v2/sqad_tools/sqad2database/sqad_db/stable"
diff --git a/add_contains_answer_sentences.py b/add_contains_answer_sentences.py
index 64bb26c84170f15f92d8d92ab8afe3f6934318d4..62a5bc6628666bfdef96a28b872d2793d8a7d622 100755
--- a/add_contains_answer_sentences.py
+++ b/add_contains_answer_sentences.py
@@ -40,7 +40,7 @@ def main():
                         required=False, default='',
                         help='Database URL')
     parser.add_argument('-p', '--port', type=int,
-                        required=False, default='',
+                        required=False, default=None,
                         help='Server port')
     parser.add_argument('-d', '--db_path', type=str,
                         required=False, default='',
diff --git a/add_similar_senteces.py b/add_similar_senteces.py
index 960b3942fcf9672687fa9962b5bf17e1ea9ef6aa..08f1e9ed3e4a6181e3f696ee145aa638cacfc01b 100755
--- a/add_similar_senteces.py
+++ b/add_similar_senteces.py
@@ -129,7 +129,7 @@ def main():
                         required=False, default='',
                         help='Database URL')
     parser.add_argument('-p', '--port', type=int,
-                        required=False, default='',
+                        required=False, default=None,
                         help='Server port')
     parser.add_argument('-d', '--db_path', type=str,
                         required=False, default='',
diff --git a/context_ner.py b/context_ner.py
index a7f2219fb17d76a78ec64443a7fb97f2b2715406..33dba8b609c864ee74384c237117ae38e270686a 100755
--- a/context_ner.py
+++ b/context_ner.py
@@ -149,7 +149,7 @@ def main():
                         required=False, default='',
                         help='Database URL')
     parser.add_argument('-p', '--port', type=int,
-                        required=False, default='',
+                        required=False, default=None,
                         help='Server port')
     parser.add_argument('-d', '--db_path', type=str,
                         required=False, default='',
diff --git a/context_np.py b/context_np.py
index fb63452a8dff3c3e4f28a17e2fce6009b750a843..da676a4b8be7595a32d11b9b1257e57c97119391 100755
--- a/context_np.py
+++ b/context_np.py
@@ -181,7 +181,7 @@ def main():
                         required=False, default='',
                         help='Database URL')
     parser.add_argument('-p', '--port', type=int,
-                        required=False, default='',
+                        required=False, default=None,
                         help='Server port')
     parser.add_argument('-d', '--db_path', type=str,
                         required=False, default='',
diff --git a/context_previous_senteces.py b/context_previous_senteces.py
index e553b6b842b7212d276cdec5cce3a88151e03e60..ca1e91d4f7113774501a47d9d439e1815a9e9077 100755
--- a/context_previous_senteces.py
+++ b/context_previous_senteces.py
@@ -58,7 +58,7 @@ def main():
                         required=False, default='',
                         help='Database URL')
     parser.add_argument('-p', '--port', type=int,
-                        required=False, default='',
+                        required=False, default=None,
                         help='Server port')
     parser.add_argument('-d', '--db_path', type=str,
                         required=False, default='',