diff --git a/flask-app/!!build__dist_pyinstaller.bat b/flask-app/!!build__dist_pyinstaller.bat
index 3933f0b..766a273 100644
--- a/flask-app/!!build__dist_pyinstaller.bat
+++ b/flask-app/!!build__dist_pyinstaller.bat
@@ -70,6 +70,16 @@ set extras=
 set subdir=tools\
 call:buildFiles
 
+set fileHandle=update-ns
+set extras=
+set subdir=tools\
+call:buildFiles
+
+set fileHandle=secrets-gen
+set extras=
+set subdir=tools\
+call:buildFiles
+
 echo.
 echo Finished !!!
 echo.
diff --git a/flask-app/.vscode/launch.json b/flask-app/.vscode/launch.json
index 7239ea1..282eba5 100644
--- a/flask-app/.vscode/launch.json
+++ b/flask-app/.vscode/launch.json
@@ -17,7 +17,7 @@
                 //"--port=80",
                 "--port=5900",
                 "--debugger",
-                "--reload" 
+                "--reload"
             ],
             "jinja": true
         },
@@ -54,8 +54,8 @@
                 //"--port", "80",
                 //"--config", "conf/mtw.ini",
                 //"--config", "conf/mtw-fr.ini",
-                //"--debug",
-                "--fqdn=test.medvik.cz", 
+                "--debug",
+                "--fqdn=test.medvik.cz",
                 //"--relax"
             ],
             "jinja": true
@@ -74,11 +74,11 @@
                 //"--port", "5903",
                 //"--config", "conf/mtw.ini",
                 //"--config", "conf/mtw-fr.ini",
-                //"--debug"
+                "--debug"
                 //"--relax"
             ],
             "jinja": true
-        },                
+        },
         {
             "name": "mesh-trx2nt",
             "type": "debugpy",
@@ -90,7 +90,7 @@
                 "tools/trans_only_2023_expanded_fre.txt",
                 "fr",
                 "http://meshfr.medvik.cz/link/"
-            ],            
-        }        
+            ],
+        }
     ]
 }
\ No newline at end of file
diff --git a/flask-app/application/main.py b/flask-app/application/main.py
index 25ac355..622c8c1 100644
--- a/flask-app/application/main.py
+++ b/flask-app/application/main.py
@@ -56,7 +56,7 @@ def create_app(debug=False, logger=None, port=5900,
     app.config.update(dict(
         APPLICATION_ROOT = url_prefix,
         APP_NAME = 'MTW',
-        APP_VER = '1.6.8',
+        APP_VER = '1.6.9',
         API_VER = '1.0.0',
         DBVERSION = 1.0,
         CACHE_DIR = mtu.get_instance_dir(app, 'cache'),
diff --git a/flask-app/application/modules/routes.py b/flask-app/application/modules/routes.py
index 4ae9a9d..c9debe9 100644
--- a/flask-app/application/modules/routes.py
+++ b/flask-app/application/modules/routes.py
@@ -1072,12 +1072,18 @@ def search(dui, action):
         if scr in ['yes', 'no']:
             session['scr'] = scr
 
+    if request.args.get('qtp'):
+        qtp = request.args.get('qtp').strip()
+        if qtp in ['def', 'all', 'notes']:
+            session['qtp'] = qtp
+
     if action == 'clear':
         session.pop('q', None)
         session.pop('sshow', None)
         session.pop('sstatus', None)
         session.pop('slang', None)
         session.pop('scr', None)
+        session.pop('qtp', None)
         session.pop('dui', None)
         session.pop('adui', None)
 
@@ -1150,7 +1156,7 @@ def search(dui, action):
     if text_query:
         data = sparql.getSparqlData('search',
                                     query=text_query, show=session.get('sshow'), status=session.get('sstatus'),
-                                    slang=session.get('slang'), scr=session.get('scr'))
+                                    slang=session.get('slang'), scr=session.get('scr'), qtp=session.get('qtp'))
         # pp.pprint(data)
 
         if data:
@@ -1180,7 +1186,8 @@ def search(dui, action):
 
     return render_template('search.html',
                            hits_cnt=hits_cnt, hits=hits, dui=dui, tree=tree, descriptor=descriptor, concepts=concepts, tab=tab,
-                           show=session.get('sshow'), status=session.get('sstatus'), slang=session.get('slang'), scr=session.get('scr'),
+                           show=session.get('sshow'), status=session.get('sstatus'),
+                           slang=session.get('slang'), scr=session.get('scr'), qtp=session.get('qtp'),
                            audit=audit, dview=dview)
 
 
diff --git a/flask-app/application/modules/sparql.py b/flask-app/application/modules/sparql.py
index 92f6da3..8a46f72 100644
--- a/flask-app/application/modules/sparql.py
+++ b/flask-app/application/modules/sparql.py
@@ -36,7 +36,7 @@ def show_elapsed(begin, tag=''):
 
 
 def getSparqlData(template, query='', show='', status='', top='', tn='', concept='', otype='Descriptor',
-                  output='json', slang=None, lang=None, scr=None, key=None, cache=None):
+                  output='json', slang=None, lang=None, scr=None, qtp=None, key=None, cache=None):
 
     t0 = timer()
 
@@ -60,9 +60,10 @@ def getSparqlData(template, query='', show='', status='', top='', tn='', concept
 
     sparql = render_template('sparql/' + template + '.sparql', query=cleanQuery(query), otype=otype,
                              show=show, status=status, top=top, tn=tn, toptn=toptn, concept=concept,
-                             lang=lang, lang_umls=lang_umls, slang=slang, scr=scr)
+                             lang=lang, lang_umls=lang_umls, slang=slang, scr=scr, qtp=qtp)
 
-    # print(sparql)
+    if app.debug:
+        print(sparql, '\n')
 
     endpoint = app.config['SPARQL_HOST'] + app.config['SPARQL_DATASET'] + '/query'
 
diff --git a/flask-app/application/modules/utils.py b/flask-app/application/modules/utils.py
index 0eae61e..e533577 100644
--- a/flask-app/application/modules/utils.py
+++ b/flask-app/application/modules/utils.py
@@ -156,6 +156,7 @@ def getLocalConfValue(conf, fp=''):
         d['GCSP'] = json.loads(conf.get(section, 'GCSP'))
         d['CHAR_NORM_FILE'] = conf.get(section, 'CHAR_NORM_FILE', fallback='norm_chars_table.tsv.txt')
         d['MESH_BROWSER'] = conf.get(section, 'MESH_BROWSER', fallback='https://meshb.nlm.nih.gov/record/ui?ui=')
+        d['USE_PROP_LISTS'] = conf.getboolean(section, 'USE_PROP_LISTS', fallback=False)
 
         section = 'sparqlconf'
         d['SPARQL_HOST'] = conf.get(section, 'SPARQL_HOST', fallback='http://127.0.0.1:3030/')
@@ -349,7 +350,7 @@ def getLookupJson(lookups, export):
         dui = item['dui']
 
         d = {}
-        if item.get('active', '') == 'false':
+        if item.get('active') == 'false':
             d['active'] = False
             d['eng'] = item.get('den', '').replace('[OBSOLETE]', '').strip()
         else:
@@ -378,7 +379,7 @@ def getLookupJson(lookups, export):
 
         if export == 'marc':
             if xterms.get(dui):
-                if xterms[dui].get('active') == 'true':
+                if xterms[dui].get('active', 'true') == 'true':
                     # terms termsx nterms ntermsx
                     for termtype in ['terms', 'termsx', 'nterms', 'ntermsx']:
                         if xterms[dui].get(termtype):
@@ -396,7 +397,7 @@ def getLookupJson(lookups, export):
             trees = item.get('trn', '').split('~')
             for trn in trees:
                 if trn:
-                    if item.get('active', '') == 'false':
+                    if item.get('active') == 'false':
                         trn = trn.replace('[OBSOLETE]', '').strip()
                         if 'x' not in d['cat']:
                             d['cat'].append('x')
@@ -557,7 +558,7 @@ def getElasticData(data):
                 # resp.append({'index': {'_id': trn, '_index': 'mesht'}})
                 resp.append({'id': dui, 'db': 'mesht', 'trn': trn.replace('.', '-'),
                              'eng': item.get('eng', ''), 'trx': item.get('trx', ''),
-                             'active': item.get('active')})
+                             'active': item.get('active', 'true')})
 
         # Add later by running:  grind-data elastic mesh ...
         # resp.append({'index': {'_id': dui, '_index': 'mesh'}})
@@ -579,7 +580,7 @@ def getElasticData(data):
                 # resp.append({'index': {'_id': trn, '_index': 'mesht'}})
                 resp.append({'id': dui, 'db': 'mesht', 'trn': trn.replace('.', '-'),
                              'eng': item.get('eng', ''), 'trx': item.get('trx', ''),
-                             'active': item.get('active')})
+                             'active': item.get('active', 'true')})
 
         if qualifs.get(dui):
             qa = []
@@ -760,7 +761,7 @@ def getLookupXml(lookups, export, as_string=True):
         trx = html.escape(items[k].get('trx', ''))
         dclass = items[k].get('dc', '-1')
 
-        if items[k].get('active') is False:
+        if items[k].get('active', True) is False:
             line = '<%s id="%s" eng="%s" trx="%s" dclass="%s" active="0" />\n' % (tag, k, eng, trx, dclass)
         else:
             line = '<%s id="%s" eng="%s" trx="%s" dclass="%s" />\n' % (tag, k, eng, trx, dclass)
@@ -827,7 +828,7 @@ def getMarc(lookups, export, params, as_string=True):
 
         item = items[mid]
 
-        if item.get('active') is True:
+        if item.get('active', True):
             cnt += 1
             marc.write(leader)
             marc.write(line_pref + '001' + code_pref + mid + '\n')
@@ -879,7 +880,7 @@ def getMarc(lookups, export, params, as_string=True):
             marc.write('\n')
 
         qa = qualifs.get(mid)
-        if item.get('active') is True and qa and ecin == 'yes':
+        if item.get('active', True) and qa and ecin == 'yes':
             for qui in qa.split('~'):
                 cnt += 1
                 marc.write(leader)
@@ -948,7 +949,7 @@ def getMarcFields(dui, item, descriptors, qualifiers, qualifs, xnote, lp='=', cp
     btdx = []
     for d in item.get('btd', []):
         des = descriptors.get(d)
-        if des.get('active') is True:
+        if des.get('active', True) is True:
             trx = des.get('trx')
             if not trx:
                 trx = des.get('eng')
@@ -964,7 +965,7 @@ def getMarcFields(dui, item, descriptors, qualifiers, qualifs, xnote, lp='=', cp
     ntdx = []
     for d in item.get('ntd', []):
         des = descriptors.get(d)
-        if des.get('active') is True:
+        if des.get('active', True) is True:
             trx = des.get('trx')
             if not trx:
                 trx = des.get('eng')
@@ -980,7 +981,7 @@ def getMarcFields(dui, item, descriptors, qualifiers, qualifs, xnote, lp='=', cp
     rtdx = []
     for d in item.get('rtd', []):
         des = descriptors.get(d)
-        if des.get('active') is True:
+        if des.get('active', True) is True:
             trx = des.get('trx')
             if not trx:
                 trx = des.get('eng')
@@ -996,7 +997,7 @@ def getMarcFields(dui, item, descriptors, qualifiers, qualifs, xnote, lp='=', cp
     pax = []
     for d in item.get('pa', []):
         des = descriptors.get(d)
-        if des.get('active') is True:
+        if des.get('active', True) is True:
             trx = des.get('trx')
             if not trx:
                 trx = des.get('eng')
@@ -1409,7 +1410,7 @@ def getParamsForAudit(dui, concept, cui):
     par['cui'] = cui
 
     if citem:
-        par['active'] = citem['active']
+        par['active'] = citem.get('active', True)
         par['label'] = citem['label']
         par['rel'] = citem['rel']
         par['terms'] = citem['terms']['target']
diff --git a/flask-app/application/templates/modals/edit-concept.html b/flask-app/application/templates/modals/edit-concept.html
index dd9b951..c8d71f8 100644
--- a/flask-app/application/templates/modals/edit-concept.html
+++ b/flask-app/application/templates/modals/edit-concept.html
@@ -15,7 +15,7 @@ <h4 class="modal-title">{{ descriptor['labels']['en'] }}
 
      {% if item['ntx'] %}
          {% set text_notrx_label = 'text-warning' %}
-     {% elif item['active'] == 'false' %}
+     {% elif item.get('active') == 'false' %}
          {% set text_notrx_label = 'text-danger' %}
      {% endif %}
 
@@ -167,7 +167,7 @@ <h4 class="modal-title">
 
           <input type="hidden"
                  name="active"
-                 value="{{ item['active'] }}">
+                 value="{{ item.get('active', 'true') }}">
 
           <input type="hidden"
                  name="label"
@@ -216,7 +216,7 @@ <h4 class="modal-title">
 
           {% if session.ugroup in ['admin','manager','editor'] %}
 
-            {% if item['active'] == 'false' %}
+            {% if item.get('active') == 'false' %}
               {% if session.ugroup in ['admin','manager'] %}
                {% set del_butt_label = 'Purge Concept & Terms' %}
                {% set del_butt_outline = 'danger' %}
@@ -237,10 +237,11 @@ <h4 class="modal-title">
 
             <button type="button" class="btn btn-outline-{{ del_butt_outline }} mr-auto {{ del_butt_invisible }} {{ del_butt_disabled }}"
                     data-dismiss="modal" data-toggle="modal" data-target="#deleteConcept" data-concept="{{ item['cui'] }}"
-                    data-form="#editConcept-{{ item['cui'] }}" data-active="{{ item['active'] }}">{{ del_butt_label }}</button>
+                    data-form="#editConcept-{{ item['cui'] }}"
+                    data-active="{{ item.get('active', 'true') }}">{{ del_butt_label }}</button>
 
           {% else %}
-            {% if item['active'] == 'false' %}
+            {% if item.get('active') == 'false' %}
                <button type="button" class="btn btn-outline-warning mr-auto">Deleted</button>
             {% endif %}
           {% endif %}
@@ -249,7 +250,7 @@ <h4 class="modal-title">
 
             <button type="button" class="btn btn-link ml-3" data-dismiss="modal">Close</button>
 
-         {% if item['active'] == 'false' and item['lang'] == config.TARGET_LANG and item['lang'] != 'en' %}
+         {% if item.get('active') == 'false' and item['lang'] == config.TARGET_LANG and item['lang'] != 'en' %}
             {% set submit_inactive = 'disabled' %}
          {% endif %}
 
diff --git a/flask-app/application/templates/snips/concepts.html b/flask-app/application/templates/snips/concepts.html
index 1d754ad..55a3128 100644
--- a/flask-app/application/templates/snips/concepts.html
+++ b/flask-app/application/templates/snips/concepts.html
@@ -12,7 +12,7 @@
       <ul class="list-unstyled {{ c_class }}">
           {% if item['ntx'] %}
             {% set item_text = 'text-warning' %}
-          {% elif item['active'] == 'false'  %}
+          {% elif item.get('active') == 'false' %}
             {% set item_text = 'text-danger' %}
           {% else %}
             {% set item_text = 'text-muted' %}
@@ -33,7 +33,7 @@
 
           {% elif item['status'] == 'OK' %}
 
-            {% if not item.get('cpid') and item.get('tnote') and session.ugroup in ['admin'] and item.get('active') == 'true' %}
+            {% if not item.get('cpid') and item.get('tnote') and session.ugroup in ['admin'] and item.get('active', 'true') == 'true' %}
 
             <a href="{{ url_for('add_cpid', dui=dui, cui=item['cui']) }}">
               <button type="link" class="btn btn-primary btn-sm ml-1" title="Generate custom CUI">
@@ -53,31 +53,36 @@
           {% if item['scn'] and item['scnt'] %}
           <button type="button" class="btn btn-primary btn-sm ml-1" title="Edit ScopeNote"
                   data-toggle="modal" data-target="#editScopeNote"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scn="{{ item['scn'] }}" data-scnt="{{ item['scnt'] }}">
             <i class="fas fa-sticky-note text-success"></i></button>
           {% elif item['scn'] %}
           <button type="button" class="btn btn-primary btn-sm ml-1" title="Add Translated ScopeNote"
                   data-toggle="modal" data-target="#editScopeNote"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scn="{{ item['scn'] }}" data-scnt="">
             <i class="fas fa-sticky-note text-info"></i></button>
           {% elif item['scne'] and item['scnt'] %}
           <button type="button" class="btn btn-primary btn-sm ml-1" title="Edit ScopeNotes"
                   data-toggle="modal" data-target="#editScopeNote" data-enable="scn"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scne="{{ item['scne'] }}" data-scnt="{{ item['scnt'] }}">
             <i class="fas fa-sticky-note text-success"></i></button>
           {% elif item['scnt']  %}
           <button type="button" class="btn btn-primary btn-sm ml-1" title="Add English ScopeNote"
                   data-toggle="modal" data-target="#editScopeNote" data-enable="scn"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scne="" data-scnt="{{ item['scnt'] }}">
             <i class="fas fa-sticky-note text-warning"></i></button>
           {% elif item['scne']  %}
           <button type="button" class="btn btn-primary btn-sm ml-1" title="Add Translated ScopeNote"
                   data-toggle="modal" data-target="#editScopeNote" data-enable="scn"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scne="{{ item['scne'] }}" data-scnt="">
             <i class="fas fa-sticky-note text-info"></i></button>
 
@@ -86,7 +91,8 @@
             {% if item['status'] == 'OK' and item['lang'] == config.TARGET_LANG %}
             <button type="button" class="btn btn-primary btn-sm ml-1" title="Add ScopeNotes"
                   data-toggle="modal" data-target="#editScopeNote" data-enable="scn"
-                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}" data-active="{{ item['active'] }}"
+                  data-cpid="{{ item['cpid'] }}" data-label="{{ item['label']|truncate(50, True) }}" data-concept="{{ item['rc'] }}"
+                  data-active="{{ item.get('active', 'true') }}"
                   data-scne="" data-scnt="">
             <i class="fas fa-sticky-note"></i></button>
             {% endif %}
diff --git a/flask-app/application/templates/snips/filters-lang.html b/flask-app/application/templates/snips/filters-lang.html
index 178a32d..3af5d02 100644
--- a/flask-app/application/templates/snips/filters-lang.html
+++ b/flask-app/application/templates/snips/filters-lang.html
@@ -1,40 +1,59 @@
-    {% if slang == 'target' %}
-        {% set TRG_CHECKED = 'checked' %}
-    {% elif slang == 'source' %}
-        {% set SRC_CHECKED = 'checked' %}
+{% if slang == 'target' %}
+    {% set TRG_CHECKED = 'checked' %}
+{% elif slang == 'source' %}
+    {% set SRC_CHECKED = 'checked' %}
+{% else %}
+    {% set ALL_LANGS = 'checked' %}
+{% endif %}
+<div class="form-group mb-2">
+  <div class="custom-control custom-radio custom-control-inline">
+    <input type="radio" id="radioLangAll" name="lang" value="all" class="custom-control-input" {{ ALL_LANGS }}>
+    <label class="custom-control-label" for="radioLangAll">Both langs</label>
+  </div>
+  <div class="custom-control custom-radio custom-control-inline">
+    <input type="radio" id="radioLangSource" name="lang" value="source" class="custom-control-input" {{ SRC_CHECKED }}>
+    <label class="custom-control-label" for="radioLangSource">Source</label>
+  </div>
+  <div class="custom-control custom-radio custom-control-inline">
+    <input type="radio" id="radioLangTarget" name="lang" value="target" class="custom-control-input" {{ TRG_CHECKED }}>
+    <label class="custom-control-label text-success" for="radioLangTarget">Target</label>
+  </div>
+</div>
+{% if scr == 'yes' %}
+    {% set SCR_YES = 'checked' %}
+{% else %}
+    {% set SCR_NO = 'checked' %}
+{% endif %}
+<div class="form-group mb-2">
+  <div class="custom-control custom-radio custom-control-inline">
+    <input type="radio" class="custom-control-input" name="scr" value="no" id="radioScrNo" {{ SCR_NO }}>
+    <label class="custom-control-label" for="radioScrNo">Exclude SCR</label>
+  </div>
+  <div class="custom-control custom-radio custom-control-inline">
+    <input type="radio" class="custom-control-input" name="scr" value="yes" id="radioScrYes" {{ SCR_YES }}>
+    <label class="custom-control-label" for="radioScrYes">Include SCR</label>
+  </div>
+</div>
+{% if config.USE_PROP_LISTS %}
+    {% if qtp == 'all' %}
+        {% set QTYPE_ALL = 'checked' %}
+    {% elif qtp == 'notes' %}
+        {% set QTYPE_NOTES = 'checked' %}
     {% else %}
-        {% set ALL_LANGS = 'checked' %}
+        {% set QTYPE_DEF = 'checked' %}
     {% endif %}
-    
-        <div class="form-group mb-2">                  
-          <div class="custom-control custom-radio custom-control-inline">
-            <input type="radio" id="radioLangAll" name="lang" value="all" class="custom-control-input" {{ ALL_LANGS }}>
-            <label class="custom-control-label" for="radioLangAll">Both langs</label>
-          </div>
-          <div class="custom-control custom-radio custom-control-inline">
-            <input type="radio" id="radioLangSource" name="lang" value="source" class="custom-control-input" {{ SRC_CHECKED }}>
-            <label class="custom-control-label" for="radioLangSource">Source</label>
-          </div>
-          <div class="custom-control custom-radio custom-control-inline">
-            <input type="radio" id="radioLangTarget" name="lang" value="target" class="custom-control-input" {{ TRG_CHECKED }}>
-            <label class="custom-control-label text-success" for="radioLangTarget">Target</label>
-          </div>                             
-        </div>    
-    
-    {% if scr == 'yes' %}
-        {% set SCR_YES = 'checked' %}
-    {% else %} 
-        {% set SCR_NO = 'checked' %}
-    {% endif %}    
-
-        <div class="form-group mb-2">                  
-          <div class="custom-control custom-radio custom-control-inline">
-            <input type="radio" class="custom-control-input" name="scr" value="no" id="radioScrNo" {{ SCR_NO }}>
-            <label class="custom-control-label" for="radioScrNo">Exclude SCR</label>
-          </div>
-          <div class="custom-control custom-radio custom-control-inline">
-            <input type="radio" class="custom-control-input" name="scr" value="yes" id="radioScrYes" {{ SCR_YES }}>
-            <label class="custom-control-label" for="radioScrYes">Include SCR</label>
-          </div>                             
-        </div>
-
+    <div class="form-group mb-2">
+      <div class="custom-control custom-radio custom-control-inline">
+        <input type="radio" class="custom-control-input" name="qtp" value="def" id="radioQueryDef" {{ QTYPE_DEF }}>
+        <label class="custom-control-label" for="radioQueryDef">Main terms</label>
+      </div>
+      <div class="custom-control custom-radio custom-control-inline">
+        <input type="radio" class="custom-control-input" name="qtp" value="all" id="radioQueryAll" {{ QTYPE_ALL }}>
+        <label class="custom-control-label" for="radioQueryAll">All fields</label>
+      </div>
+      <div class="custom-control custom-radio custom-control-inline">
+        <input type="radio" class="custom-control-input" name="qtp" value="notes" id="radioQueryNotes" {{ QTYPE_NOTES }}>
+        <label class="custom-control-label" for="radioQueryNotes">Notes only</label>
+      </div>
+    </div>
+{% endif %}
diff --git a/flask-app/application/templates/snips/terms.html b/flask-app/application/templates/snips/terms.html
index 0aee363..e6220e5 100644
--- a/flask-app/application/templates/snips/terms.html
+++ b/flask-app/application/templates/snips/terms.html
@@ -1,5 +1,5 @@
 
-            {% if term['active'] == 'true' %}
+            {% if term.get('active', 'true') == 'true' %}
               {% set term_text = '' %}
             {% else %}
               {% set term_text = 'text-muted' %}
@@ -15,10 +15,10 @@
 
             <li class="pb-1 {{ term_class }} {{ term_text }}" data-ttype="{{ term['ttype'] }}">
                {{ term['prefLabel'] }}
-               
+
                {% if term['lexicalTag'] != 'NON' %}
                  <span class="font-weight-light text-info"> {{ term['lexicalTag'] }} </span>
-               {% endif %}               
+               {% endif %}
 
                {% if term['tpid'] %}
                   <span class="text-muted term font-weight-normal"><small> {{ term['tpid'] }} </small></span>
diff --git a/flask-app/application/templates/sparql/concepts_terms.sparql b/flask-app/application/templates/sparql/concepts_terms.sparql
index c671b49..7394ef5 100644
--- a/flask-app/application/templates/sparql/concepts_terms.sparql
+++ b/flask-app/application/templates/sparql/concepts_terms.sparql
@@ -176,7 +176,7 @@ ORDER BY ?ctype ?ttype ?tlabel
   OPTIONAL {?t mesht:lexicalTag ?ltag }
   OPTIONAL {?c mesht:identifier ?cpid }
   OPTIONAL {?t mesht:identifier ?tpid }
-  OPTIONAL {?c mesht:notTranslatable ?ntx}
+  OPTIONAL {?c mesht:notTranslatable ?ntx }
   OPTIONAL {?c mesht:translatorsNote ?cnote }
   OPTIONAL {?t mesht:translatorsNote ?tnote }
   OPTIONAL {?t meshv:dateCreated ?dateCreated }
diff --git a/flask-app/application/templates/sparql/exports/lookups_base.sparql b/flask-app/application/templates/sparql/exports/lookups_base.sparql
index 998356a..b1c59a3 100644
--- a/flask-app/application/templates/sparql/exports/lookups_base.sparql
+++ b/flask-app/application/templates/sparql/exports/lookups_base.sparql
@@ -1,8 +1,8 @@
-## Base export query v1.1
+## Base export query v1.2
 
 {% include 'sparql/_namespaces.sparql' %}
 
-SELECT ?dui ?cui ?dtype ?den ?trx ?notrx ?active ?crt ?est ?nlm ?cas ?rn 
+SELECT ?dui ?cui ?dtype ?den ?trx ?notrx ?active ?crt ?est ?nlm ?cas ?rn
       (GROUP_CONCAT(DISTINCT ?rnr ; separator='~') AS ?rrn)
       (GROUP_CONCAT(DISTINCT ?trns ; separator='~') AS ?trn)
       (GROUP_CONCAT(DISTINCT ?pac ; separator='~') AS ?pa)
@@ -13,7 +13,10 @@ WHERE {
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
   ?d meshv:identifier ?dui .
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   ?d meshv:dateCreated ?crt .
   ?d meshv:dateEstablished ?est .
   OPTIONAL {
@@ -58,6 +61,6 @@ WHERE {
   OPTIONAL { ?c meshv:relatedRegistryNumber ?rnr }
   OPTIONAL { ?c meshv:casn1_label ?cas }
 }
-GROUP BY ?dui ?cui ?dtype ?den ?trx ?notrx ?active ?crt ?est ?nlm ?cas ?rn  
+GROUP BY ?dui ?cui ?dtype ?den ?trx ?notrx ?active ?crt ?est ?nlm ?cas ?rn
 ###LIMIT 100
 
diff --git a/flask-app/application/templates/sparql/exports/lookups_qualifs.sparql b/flask-app/application/templates/sparql/exports/lookups_qualifs.sparql
index 28fe061..ff432f5 100644
--- a/flask-app/application/templates/sparql/exports/lookups_qualifs.sparql
+++ b/flask-app/application/templates/sparql/exports/lookups_qualifs.sparql
@@ -1,4 +1,4 @@
-## Base allowed qualifs export query v1.0
+## Base allowed qualifs export query v1.1
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -7,12 +7,17 @@ SELECT ?dui
 WHERE {
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag))
-  ?d meshv:active ?actived .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?actived) .
   FILTER(?actived)
+
   ?d meshv:identifier ?dui .
   ?d meshv:allowableQualifier ?q .
-  ##?q meshv:active ?activeq .
+
+  ##BIND(IF(EXISTS { ?q meshv:active false }, false, true) AS ?activeq) .
   ##FILTER(?activeq)
+
   ?q meshv:identifier ?qui
 }
 GROUP BY ?dui
diff --git a/flask-app/application/templates/sparql/exports/lookups_terms.sparql b/flask-app/application/templates/sparql/exports/lookups_terms.sparql
index e246b26..c47d812 100644
--- a/flask-app/application/templates/sparql/exports/lookups_terms.sparql
+++ b/flask-app/application/templates/sparql/exports/lookups_terms.sparql
@@ -1,4 +1,4 @@
-## Terms export query v1.1
+## Terms export query v1.2
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -10,7 +10,10 @@ SELECT ?dui ?active
 WHERE {
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   ?d meshv:identifier ?dui .
   ?d meshv:preferredConcept ?c .
 
diff --git a/flask-app/application/templates/sparql/exports/lookups_use_instead.sparql b/flask-app/application/templates/sparql/exports/lookups_use_instead.sparql
index 51a9ca8..4e54e9a 100644
--- a/flask-app/application/templates/sparql/exports/lookups_use_instead.sparql
+++ b/flask-app/application/templates/sparql/exports/lookups_use_instead.sparql
@@ -1,16 +1,21 @@
-## useInstead Descriptor-qualifs export query v1.1
+## useInstead Descriptor-qualifs export query v1.2
 
 {% include 'sparql/_namespaces.sparql' %}
 
 SELECT ?dui (GROUP_CONCAT(DISTINCT ?o ; separator='|') AS ?qn)
 WHERE {
   ?ddq meshv:hasDescriptor ?d .
-  ?ddq meshv:active ?ddqactive .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?ddq meshv:active false }, false, true) AS ?ddqactive) .
   FILTER(?ddqactive) .
+
   ?d meshv:identifier ?dui .
   ?ddq meshv:useInstead ?adq .
-  ?adq meshv:active ?adqactive .
+
+  BIND(IF(EXISTS { ?adq meshv:active false }, false, true) AS ?adqactive) .
   FILTER(?adqactive) .
+
   ?ddq meshv:hasQualifier ?q .
   ?q meshv:identifier ?qui .
   BIND( CONCAT(STR(?qui), '~', REPLACE(STR(?adq), str(mesh:), '')) AS ?o)
diff --git a/flask-app/application/templates/sparql/exports/umls.sparql b/flask-app/application/templates/sparql/exports/umls.sparql
index 140e6f4..635447f 100644
--- a/flask-app/application/templates/sparql/exports/umls.sparql
+++ b/flask-app/application/templates/sparql/exports/umls.sparql
@@ -1,4 +1,4 @@
-## UMLS export query v1.0
+## UMLS export query v1.1
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -11,7 +11,10 @@ WHERE {
   ?d rdf:type ?type
   FILTER(?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
   ?d meshv:identifier ?dui .
-  ?d meshv:active ?status .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?status) .
+
   ?d meshv:preferredConcept ?c .
   ?c meshv:identifier ?cui .
   ?c mesht:preferredTerm ?t .
@@ -34,7 +37,9 @@ WHERE {
   ?d rdf:type ?type
   FILTER(?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
   ?d meshv:identifier ?dui .
-  ?d meshv:active ?status .
+
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?status) .
+
   ?d meshv:concept|mesht:concept ?c .
   OPTIONAL { ?c meshv:identifier|mesht:identifier ?cui }
   ?c mesht:preferredTerm ?t .
@@ -57,7 +62,9 @@ WHERE {
   ?d rdf:type ?type
   FILTER(?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
   ?d meshv:identifier ?dui .
-  ?d meshv:active ?status .
+
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?status) .
+
   ?d meshv:preferredConcept|meshv:concept|mesht:concept ?c .
   OPTIONAL { ?c meshv:identifier|mesht:identifier ?cui }
   ?c mesht:term ?t .
diff --git a/flask-app/application/templates/sparql/reports/todo_Preferred.sparql b/flask-app/application/templates/sparql/reports/todo_Preferred.sparql
index 7cc91e9..6da248d 100644
--- a/flask-app/application/templates/sparql/reports/todo_Preferred.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_Preferred.sparql
@@ -1,4 +1,4 @@
-### Not translated preferred Concepts/Descriptors v1.0 ###
+### Not translated preferred Concepts/Descriptors v1.1 ###
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -14,7 +14,10 @@ WHERE {
     ?id mesht:prefLabel ?val
   }
   FILTER (!BOUND(?val))
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   #?d meshv:dateCreated ?dateCrt .
   #OPTIONAL { ?d meshv:dateRevised ?dateRev }
   OPTIONAL { ?c mesht:notTranslatable ?ntx }
diff --git a/flask-app/application/templates/sparql/reports/todo_ScopeNote.sparql b/flask-app/application/templates/sparql/reports/todo_ScopeNote.sparql
index 83529d5..e9f4b87 100644
--- a/flask-app/application/templates/sparql/reports/todo_ScopeNote.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_ScopeNote.sparql
@@ -1,4 +1,4 @@
-### Not translated ScopeNote in preferred Concepts/Descriptors v1.0 ###
+### Not translated ScopeNote in preferred Concepts/Descriptors v1.1 ###
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -18,7 +18,10 @@ WHERE {
    BIND('YES' as ?scnt)
    }
    FILTER (!BOUND(?scnt))
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   #?d meshv:dateCreated ?dateCrt .
   #OPTIONAL { ?d meshv:dateRevised ?dateRev }
   OPTIONAL { ?c mesht:notTranslatable ?ntx }
diff --git a/flask-app/application/templates/sparql/reports/todo_customConcepts.sparql b/flask-app/application/templates/sparql/reports/todo_customConcepts.sparql
index 072bd3e..149d3ea 100644
--- a/flask-app/application/templates/sparql/reports/todo_customConcepts.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_customConcepts.sparql
@@ -1,4 +1,4 @@
-### Custom nonPreferred Concepts - v1.0 ###
+### Custom nonPreferred Concepts - v1.1 ###
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -10,7 +10,10 @@ SELECT distinct ?label ?d ?type ?active ?val ?lockedBy ?tui {
     ?c ?p ?t .
     ?d meshv:preferredConcept ?c .
     ?d rdf:type ?type .
-    ?d meshv:active ?active .
+
+    # Assume absence of meshv:active as true
+    BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
     ?d rdfs:label ?label .
     FILTER (lang(?label) = 'en')
     OPTIONAL {
@@ -28,7 +31,10 @@ SELECT distinct ?label ?d ?type ?active ?val ?lockedBy ?tui {
     ?c ?p ?t .
     ?d meshv:preferredConcept ?c .
     ?d rdf:type ?type .
-    ?d meshv:active ?active .
+
+    # Assume absence of meshv:active as true
+    BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
     ?d rdfs:label ?label .
     FILTER (lang(?label) = 'en')
     OPTIONAL {
@@ -46,7 +52,10 @@ SELECT distinct ?label ?d ?type ?active ?val ?lockedBy ?tui {
     ?c ?p ?t .
     ?d meshv:preferredConcept ?c .
     ?d rdf:type ?type .
-    ?d meshv:active ?active .
+
+    # Assume absence of meshv:active as true
+    BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
     ?d rdfs:label ?label .
     FILTER (lang(?label) = 'en')
     OPTIONAL {
diff --git a/flask-app/application/templates/sparql/reports/todo_nonPrefScopeNote.sparql b/flask-app/application/templates/sparql/reports/todo_nonPrefScopeNote.sparql
index dbb109d..54a88fa 100644
--- a/flask-app/application/templates/sparql/reports/todo_nonPrefScopeNote.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_nonPrefScopeNote.sparql
@@ -1,4 +1,4 @@
-### Not translated ScopeNote in nonPreferred Concepts v1.0 ###
+### Not translated ScopeNote in nonPreferred Concepts v1.1 ###
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -19,7 +19,10 @@ WHERE {
     BIND('YES' as ?scnt)
     }
   FILTER (!BOUND(?scnt))
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   #?d meshv:dateCreated ?dateCrt .
   #OPTIONAL { ?d meshv:dateRevised ?dateRev }
   OPTIONAL { ?c mesht:notTranslatable ?ntx }
diff --git a/flask-app/application/templates/sparql/reports/todo_nonPreferred.sparql b/flask-app/application/templates/sparql/reports/todo_nonPreferred.sparql
index 2f66a94..72d0c9c 100644
--- a/flask-app/application/templates/sparql/reports/todo_nonPreferred.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_nonPreferred.sparql
@@ -1,4 +1,4 @@
-### Not translated nonPreferred Concepts v1.1 ###
+### Not translated nonPreferred Concepts v1.2 ###
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -18,7 +18,10 @@ WHERE {
     ?idx mesht:prefLabel ?nval
   }
   FILTER (!BOUND(?nval))
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   #?d meshv:dateCreated ?dateCrt .
   #OPTIONAL { ?d meshv:dateRevised ?dateRev }
   OPTIONAL { ?d mesht:lockedBy ?lockedBy }
diff --git a/flask-app/application/templates/sparql/reports/todo_prefTermMissing.sparql b/flask-app/application/templates/sparql/reports/todo_prefTermMissing.sparql
index 277656b..34d191f 100644
--- a/flask-app/application/templates/sparql/reports/todo_prefTermMissing.sparql
+++ b/flask-app/application/templates/sparql/reports/todo_prefTermMissing.sparql
@@ -1,4 +1,4 @@
-## Descriptor predicates stats query v1.0
+## Descriptor predicates stats query v1.1
 
 {% include 'sparql/_namespaces.sparql' %}
 
@@ -10,11 +10,14 @@ WHERE {
   ?c meshv:identifier|mesht:identifier ?cui .
   ?c mesht:term|mesht:preferredTerm ?t .
   ?c rdfs:label ?label .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   OPTIONAL { ?c mesht:preferredTerm ?pt }
-  OPTIONAL { ?d meshv:active ?active }
   OPTIONAL { ?d mesht:lockedBy ?lockedBy }
   OPTIONAL { ?c mesht:notTranslatable ?ntx }
-  FILTER (!BOUND(?ntx))  
+  FILTER (!BOUND(?ntx))
   ?t mesht:prefLabel ?val
   FILTER(NOT EXISTS { ?c mesht:preferredTerm ?pt })
 }
diff --git a/flask-app/application/templates/sparql/search.sparql b/flask-app/application/templates/sparql/search.sparql
index 51c4d81..036b103 100644
--- a/flask-app/application/templates/sparql/search.sparql
+++ b/flask-app/application/templates/sparql/search.sparql
@@ -1,46 +1,52 @@
-### Search/Text query v1.2
+### Search/Text query v1.4
 ## All Descriptors & Concepts
 ## params: query string [+ filter: active=false]
 
 {% include 'sparql/_namespaces.sparql' %}
 
+{% if config.USE_PROP_LISTS %}
+    {% if qtp == 'all' %}
+        {% set prop_list = 'mesht:queryAll' %}
+    {% elif qtp == 'notes' %}
+        {% set prop_list = 'mesht:queryNotes' %}
+    {% elif qtp == 'def' %}
+        {% set prop_list = 'mesht:queryDef' %}
+    {% else %}
+        {% set prop_list = 'mesht:queryDef' %}
+    {% endif %}
+{% else %}
+    {% set prop_list = '' %}
+{% endif %}
+
 SELECT distinct ?label ?d ?type ?active ?val ?scn ?scnt ?ntx ?lockedBy {
 {
 SELECT distinct ?d ?type
 WHERE {
 
   {% if slang == 'target' %}
-    (?s ?score) text:query ("{{ query }}" 500 "lang:{{ lang }}") .
+      (?s ?score) text:query ({{ prop_list }} "{{ query }}" 500 "lang:{{ lang }}") .
   {% elif slang == 'source' %}
-    (?s ?score) text:query ("{{ query }}" 500 "lang:en") .
+      (?s ?score) text:query ({{ prop_list }} "{{ query }}" 500 "lang:en") .
   {% else %}
-    (?s ?score) text:query ("{{ query }}" 500) .
+      (?s ?score) text:query ({{ prop_list }} "{{ query }}" 500) .
   {% endif %}
 
-  OPTIONAL {
-    ?sub mesht:term|mesht:preferredTerm ?s .
-    ?d mesht:concept ?sub .
-    ?d rdf:type ?type .
-    ?d rdfs:label ?label .
-    FILTER(?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
-  }
-
   OPTIONAL {
     BIND(?s as ?d)
     ?s rdf:type ?type .
     ?s rdfs:label ?label .
     FILTER(?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
     }
-    
-  {% if scr == 'yes' %}  
+
+  {% if scr == 'yes' %}
   OPTIONAL {
     ?s meshv:mappedTo|meshv:preferredMappedTo|meshv:pharmacologicalAction ?d .
     ?d rdf:type ?type .
     ?d rdfs:label ?label .
     FILTER (?type IN(meshv:TopicalDescriptor,meshv:Descriptor))
     }
-  {% endif %}    
-    
+  {% endif %}
+
   OPTIONAL {
     ?d meshv:treeNumber ?s .
     ?d rdf:type ?type .
@@ -71,7 +77,7 @@ WHERE {
     ?d mesht:concept ?s .
     ?d rdf:type ?type .
     }
-             
+
 FILTER (BOUND(?d))
 FILTER (?type IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
 }
@@ -79,15 +85,17 @@ ORDER BY DESC(?score)
   }
   ?d rdfs:label ?label .
   FILTER ( lang(?label) = 'en' )
-  ?d meshv:active ?active .
   ?d meshv:preferredConcept ?c .
 
-    {% if status == 'active' %}
-        FILTER (?active)
-    {% endif %}
-    {% if status == 'deleted' %}
-        FILTER (!?active)
-    {% endif %}
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
+  {% if status == 'active' %}
+      FILTER (?active)
+  {% endif %}
+  {% if status == 'deleted' %}
+      FILTER (!?active)
+  {% endif %}
 
   {% if status == 'revised' %}
       ?d meshv:dateRevised ?dateRev .
@@ -157,5 +165,3 @@ ORDER BY DESC(?score)
     {% endif %}
 
 } LIMIT 500
-
-
diff --git a/flask-app/application/templates/sparql/tree-browse.sparql b/flask-app/application/templates/sparql/tree-browse.sparql
index cb2433e..1c6914b 100644
--- a/flask-app/application/templates/sparql/tree-browse.sparql
+++ b/flask-app/application/templates/sparql/tree-browse.sparql
@@ -1,9 +1,15 @@
-## Browse query v1.0 - always with a treeNumber prefix !
+## Browse query v1.1 - always with a treeNumber prefix !
 
 ## Preferred concepts AKA descriptors
 
 {% include 'sparql/_namespaces.sparql' ignore missing %}
 
+{% if config.USE_PROP_LISTS %}
+    {% set treeno_field = '' %}
+{% else %}
+    {% set treeno_field = 'meshv:identifier' %}
+{% endif %}
+
 SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
 
 {% if show == 'ntx' %} ## notTranslatable
@@ -37,10 +43,10 @@ SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
   ##  status:{{ status }} show:{{ show }} ##
   {% if toptn %}
       ## TOPTN ##
-      (?tn ?score) text:query (meshv:identifier "{{ tn }} OR {{ toptn }} OR {{ toptn }}.*") .
+      (?tn ?score) text:query ({{ treeno_field }} "{{ tn }} OR {{ toptn }} OR {{ toptn }}.*") .
   {% else %}
       ## TOP ##
-      (?tn ?score) text:query (meshv:identifier "{{ top }}??.*") .
+      (?tn ?score) text:query ({{ treeno_field }} "{{ top }}??.*") .
   {% endif %}
         }
   }
@@ -54,10 +60,10 @@ SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
   ##  status:{{ status }} show:{{ show }} ##
   {% if toptn %}
       ## TOPTN  ##
-      (?tn ?score) text:query (meshv:identifier "{{ tn }} OR {{ tn }}.??? OR {{ toptn }} OR {{ toptn }}.???" 1000) .
+      (?tn ?score) text:query ({{ treeno_field }} "{{ tn }} OR {{ tn }}.??? OR {{ toptn }} OR {{ toptn }}.???" 1000) .
   {% else %}
       ## TOP ##
-      (?tn ?score) text:query (meshv:identifier "{{ query }}" 1000) .
+      (?tn ?score) text:query ({{ treeno_field }} "{{ query }}" 1000) .
   {% endif %}
         }
   }
@@ -73,7 +79,9 @@ SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
   ?d rdfs:label ?label .
     FILTER (lang(?label) = 'en')
 
-  ?d meshv:active ?active .
+    # Assume absence of meshv:active as true
+    BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
     {% if status == 'active' %}
         FILTER (?active)
     {% endif %}
@@ -89,7 +97,7 @@ SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
     OPTIONAL {?c meshv:scopeNote ?scnv .
               BIND('YES' as ?scn)
              }
-             
+
     OPTIONAL {?c mesht:scopeNote ?scntv
               BIND('YES' as ?scnt)
              }
@@ -130,4 +138,3 @@ SELECT distinct ?tn ?label ?d ?type ?val ?active ?scn ?scnt ?ntx ?lockedBy {
 }
 
 ORDER BY ?tn
-
diff --git a/flask-app/application/templates/sparql/tree.sparql b/flask-app/application/templates/sparql/tree.sparql
index 82f907c..249f8e6 100644
--- a/flask-app/application/templates/sparql/tree.sparql
+++ b/flask-app/application/templates/sparql/tree.sparql
@@ -1,4 +1,4 @@
-## Tree display query v1.0
+## Tree display query v1.1
 
 {% include 'sparql/_namespaces.sparql' ignore missing %}
 
@@ -9,7 +9,7 @@ WHERE {
    mesh:{{ query }} meshv:treeNumber ?treeNum .
    ?treeNum meshv:parentTreeNumber ?parent .
    BIND(CONCAT(str(?parent),'.???') as ?q) .
-   (?tn ?score ?literal) text:query (?q) .
+   (?tn ?score) text:query (?q) .
    ?d meshv:treeNumber ?tn .
    ?d meshv:preferredConcept ?c .
 }} UNION {
@@ -24,7 +24,7 @@ SELECT ?tn ?d ?c
 WHERE {
    mesh:{{ query }} meshv:treeNumber ?treeNum .
    BIND(CONCAT(str(?treeNum),'.???') as ?q) .
-   (?tn ?score ?literal) text:query (?q) .
+   (?tn ?score) text:query (?q) .
    ?d meshv:treeNumber ?tn .
    ?d meshv:preferredConcept ?c .
 }} UNION {
@@ -40,7 +40,10 @@ ORDER BY ?tn LIMIT 500
     ?d rdfs:label ?label .
     FILTER (lang(?label) = 'en') .
     ?d rdf:type ?type .
-    ?d meshv:active ?active .
+
+   # Assume absence of meshv:active as true
+   BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
     OPTIONAL {
         ?c mesht:preferredTerm ?id .
         ?id mesht:prefLabel ?val
diff --git a/flask-app/dist/instance/conf/mesh.ttl b/flask-app/dist/instance/conf/mesh.ttl
index fd10a59..d4dab55 100644
--- a/flask-app/dist/instance/conf/mesh.ttl
+++ b/flask-app/dist/instance/conf/mesh.ttl
@@ -8,7 +8,7 @@
 @prefix meshv:   <http://id.nlm.nih.gov/mesh/vocab#> .
 @prefix mesht:   <http://www.medvik.cz/schema/mesh/vocab/#> .
 
-### Version 1.0.5
+### Version 1.1.1
 
 ## Initialize text query
 [] ja:loadClass       "org.apache.jena.query.text.TextQuery" .
@@ -31,28 +31,74 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
 # A TDB dataset used for RDF storage
 <#dataset> 
     a tdb2:DatasetTDB2 ;
-    tdb2:location  "d:/Data/jena/databases/mesh" ;
+    tdb2:location  "d:/Data/jena5/databases/mesh" ;
     .
 
 # Text index description
 <#indexLucene> 
     a text:TextIndexLucene ;
-    text:directory "d:/Data/jena/indexes/mesh" ;
+    text:directory "d:/Data/jena5/indexes/mesh" ;
     text:entityMap <#entMap> ;
-    text:storeValues true ;
-    ##text:analyzer[ a text:StandardAnalyzer ] ;
+    text:storeValues false ;
+    ## text:analyzer[ a text:StandardAnalyzer ] ;
     text:analyzer [
        a text:ConfigurableAnalyzer ;
        text:tokenizer text:StandardTokenizer ;
-       text:filters (text:ASCIIFoldingFilter text:LowerCaseFilter)
+       text:filters (
+           text:ASCIIFoldingFilter
+           text:LowerCaseFilter
+           # text:PorterStemFilter
+           )
        ] ;
-    ##text:queryAnalyzer [ a text:KeywordAnalyzer ] ;
+    ## text:queryAnalyzer [ a text:KeywordAnalyzer ] ;
     text:queryParser text:AnalyzingQueryParser ;
-    ##text:defineAnalyzers [ . . . ] ;
+    ## text:defineAnalyzers [ . . . ] ;
     text:multilingualSupport true ;
-    ## TBD https://jena.apache.org/documentation/query/text-query.html#lists-of-indexed-properties :
-    ## text:propLists ( [ . . . ] . . . ) ;
- .
+    ## https://jena.apache.org/documentation/query/text-query.html#lists-of-indexed-properties - available since Jena 5.0
+    text:propLists (
+    [ text:propListProp mesht:defQuery ;
+          text:props ( 
+             rdfs:label
+               meshv:identifier 
+               meshv:prefLabel
+               meshv:altLabel
+               meshv:casn1_label
+               meshv:abbreviation
+               meshv:registryNumber
+               meshv:relatedRegistryNumber
+                 mesht:identifier 
+                 mesht:prefLabel
+                 mesht:altLabel
+             ) ;
+        ]
+    [ text:propListProp mesht:includeNotes ;
+          text:props ( 
+             rdfs:label
+               meshv:identifier 
+               meshv:prefLabel
+               meshv:altLabel
+               meshv:casn1_label
+               meshv:abbreviation
+               meshv:registryNumber
+               meshv:relatedRegistryNumber
+                 mesht:identifier 
+                 mesht:prefLabel
+                 mesht:altLabel
+                    mesht:translatorsNote
+                    mesht:annotation
+                    mesht:historyNote
+                    mesht:scopeNote
+                meshv:annotation
+                meshv:historyNote
+                meshv:note
+                meshv:onlineNote
+                meshv:publicMeSHNote
+                meshv:scopeNote
+                meshv:source
+              ) ;
+        ]
+    ) ;
+     .
 
 <#entMap> 
     a text:EntityMap ;
@@ -87,7 +133,7 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
          [ text:field "ftext" ; text:predicate mesht:translatorsNote ]
          ) .
 
-### mesh common:
+### MeSH common:
 ## abbreviation
 ## annotation
 ## historyNote
diff --git a/flask-app/dist/instance/conf/mtw-dist.ini b/flask-app/dist/instance/conf/mtw-dist.ini
index ba3cb0a..0c06ae7 100644
--- a/flask-app/dist/instance/conf/mtw-dist.ini
+++ b/flask-app/dist/instance/conf/mtw-dist.ini
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# *** Config version 1.6.5 ***
+# *** Config version 1.6.9 ***
 ### Important values are marked with !  ###
 ### ! This file MUST BE UTF-8 encoded ! ###
 ### ! Restart the App after modifying ! ###
@@ -11,25 +11,25 @@
 
 ### ! Fully qualified domain name - required !
 ##  - You can override it with --fqdn param when running mtw-server
-#SERVER_NAME = test.medvik.cz
+SERVER_NAME = test.medvik.cz
 
-### You MUST copy the content of the static dir 
-###  into Apache htdocs root or the equivalent 
+### You MUST copy the content of the static dir
+###  into Apache htdocs root or the equivalent
 ###  and rename it to: assets-mtw
-##  Add to Apache config: 
+##  Add to Apache config:
 ##   RewriteEngine on
 ##   RewriteRule ^/<prefix>/assets-mtw/(.*) /assets-mtw/$1
 
 ### ! Always set ! ###
-TARGET_YEAR = 2024
+TARGET_YEAR = 2025
 
 ### Default previous version year - used for showing modifications ###
-PREV_YEAR_DEF = 2023
-PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023
+PREV_YEAR_DEF = 2024
+PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023,2024
 
 ### Date format:  YYYY-MM-DD ###
-REVISED_AFTER = 2022-01-01
-CREATED_AFTER = 2022-01-01
+REVISED_AFTER = 2023-01-01
+CREATED_AFTER = 2023-01-01
 
 ### ! Always set ! ###
 MARC_LIBCODE = CZ-PrNML
@@ -97,8 +97,10 @@ GCSP = {"script-src":  "'self' ",
         "img-src":     "'self' *.medvik.cz *.nlk.cz data:"
         }
 
-CHAR_NORM_FILE = norm_chars_table.tsv.txt         
+CHAR_NORM_FILE = norm_chars_table.tsv.txt
 
+### Uncomment only if using Jena +5.0 - use text:propLists defined in mesh.ttl - default: False
+#USE_PROP_LISTS = True
 
 [worker]
 ### MTW Worker API settings - required !
@@ -110,7 +112,7 @@ API_TIMEOUT = 10
 API_TOKEN_MAX_AGE = 10
 
 #API_AUTH_BASIC_USER = test
-#API_AUTH_BASIC_PWD = test 
+#API_AUTH_BASIC_PWD = test
 
 [sparqlconf]
 
diff --git a/flask-app/instance/_data/MeSH2025/mesh2024_inactive.nt.gz b/flask-app/instance/_data/MeSH2025/mesh2024_inactive.nt.gz
new file mode 100644
index 0000000..674ca6b
Binary files /dev/null and b/flask-app/instance/_data/MeSH2025/mesh2024_inactive.nt.gz differ
diff --git a/flask-app/instance/conf/mesh.ttl b/flask-app/instance/conf/mesh_Jena4.ttl
similarity index 85%
rename from flask-app/instance/conf/mesh.ttl
rename to flask-app/instance/conf/mesh_Jena4.ttl
index fd10a59..97f944e 100644
--- a/flask-app/instance/conf/mesh.ttl
+++ b/flask-app/instance/conf/mesh_Jena4.ttl
@@ -8,7 +8,7 @@
 @prefix meshv:   <http://id.nlm.nih.gov/mesh/vocab#> .
 @prefix mesht:   <http://www.medvik.cz/schema/mesh/vocab/#> .
 
-### Version 1.0.5
+### Version 1.4.0 for Jena v4
 
 ## Initialize text query
 [] ja:loadClass       "org.apache.jena.query.text.TextQuery" .
@@ -29,32 +29,34 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
     .
 
 # A TDB dataset used for RDF storage
-<#dataset> 
+<#dataset>
     a tdb2:DatasetTDB2 ;
-    tdb2:location  "d:/Data/jena/databases/mesh" ;
+    tdb2:location  "d:/Data/jena4/databases/mesh" ;
     .
 
 # Text index description
-<#indexLucene> 
+<#indexLucene>
     a text:TextIndexLucene ;
-    text:directory "d:/Data/jena/indexes/mesh" ;
+    text:directory "d:/Data/jena4/indexes/mesh" ;
     text:entityMap <#entMap> ;
-    text:storeValues true ;
-    ##text:analyzer[ a text:StandardAnalyzer ] ;
+    text:storeValues false ;
+    ## text:analyzer[ a text:StandardAnalyzer ] ;
     text:analyzer [
        a text:ConfigurableAnalyzer ;
        text:tokenizer text:StandardTokenizer ;
-       text:filters (text:ASCIIFoldingFilter text:LowerCaseFilter)
+       text:filters (
+           text:ASCIIFoldingFilter
+           text:LowerCaseFilter
+           # text:PorterStemFilter
+           )
        ] ;
-    ##text:queryAnalyzer [ a text:KeywordAnalyzer ] ;
+    ## text:queryAnalyzer [ a text:KeywordAnalyzer ] ;
     text:queryParser text:AnalyzingQueryParser ;
-    ##text:defineAnalyzers [ . . . ] ;
+    ## text:defineAnalyzers [ . . . ] ;
     text:multilingualSupport true ;
-    ## TBD https://jena.apache.org/documentation/query/text-query.html#lists-of-indexed-properties :
-    ## text:propLists ( [ . . . ] . . . ) ;
- .
+    .
 
-<#entMap> 
+<#entMap>
     a text:EntityMap ;
     text:defaultField     "ftext" ;
     text:entityField      "uri" ;
@@ -75,7 +77,7 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
          [ text:field "ftext" ; text:predicate meshv:note ]
          [ text:field "ftext" ; text:predicate meshv:onlineNote ]
          [ text:field "ftext" ; text:predicate meshv:publicMeSHNote ]
-         [ text:field "ftext" ; text:predicate meshv:source ]
+         # [ text:field "ftext" ; text:predicate meshv:source ]
          [ text:field "ftext" ; text:predicate meshv:scopeNote ]
          [ text:field "ftext" ; text:predicate mesht:abbreviation ]
          [ text:field "ftext" ; text:predicate mesht:annotation ]
@@ -87,7 +89,7 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
          [ text:field "ftext" ; text:predicate mesht:translatorsNote ]
          ) .
 
-### mesh common:
+### MeSH common:
 ## abbreviation
 ## annotation
 ## historyNote
@@ -107,7 +109,7 @@ text:TextIndexES    rdfs:subClassOf   text:TextIndex .
 ### Translation only:
 ## mesht:translatorsNote
 
-<#service_text_tdb> 
+<#service_text_tdb>
     a fuseki:Service ;
     rdfs:label                      "MeSH-Translation-service" ;
     fuseki:name                     "mesh" ;
diff --git a/flask-app/instance/conf/mesh_Jena5.ttl b/flask-app/instance/conf/mesh_Jena5.ttl
new file mode 100644
index 0000000..16aa1e5
--- /dev/null
+++ b/flask-app/instance/conf/mesh_Jena5.ttl
@@ -0,0 +1,183 @@
+@prefix :        <http://localhost/jena_example/#> .
+@prefix rdf:     <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
+@prefix rdfs:    <http://www.w3.org/2000/01/rdf-schema#> .
+@prefix tdb2:    <http://jena.apache.org/2016/tdb#> .
+@prefix ja:      <http://jena.hpl.hp.com/2005/11/Assembler#> .
+@prefix text:    <http://jena.apache.org/text#> .
+@prefix fuseki:  <http://jena.apache.org/fuseki#> .
+@prefix meshv:   <http://id.nlm.nih.gov/mesh/vocab#> .
+@prefix mesht:   <http://www.medvik.cz/schema/mesh/vocab/#> .
+
+### Version 1.5.0 for Jena v5
+
+## Initialize text query
+[] ja:loadClass       "org.apache.jena.query.text.TextQuery" .
+# A TextDataset is a regular dataset with a text index.
+text:TextDataset      rdfs:subClassOf   ja:RDFDataset .
+# Lucene index
+text:TextIndexLucene  rdfs:subClassOf   text:TextIndex .
+# Elasticsearch index
+text:TextIndexES    rdfs:subClassOf   text:TextIndex .
+
+## ---------------------------------------------------------------
+## This URI must be fixed - it's used to assemble the text dataset.
+
+:text_dataset
+    a text:TextDataset ;
+    text:dataset   <#dataset> ;
+    text:index     <#indexLucene> ;
+    .
+
+# A TDB dataset used for RDF storage
+<#dataset>
+    a tdb2:DatasetTDB2 ;
+    tdb2:location  "d:/Data/jena5/databases/mesh" ;
+    .
+
+# Text index description
+<#indexLucene>
+    a text:TextIndexLucene ;
+    text:directory "d:/Data/jena5/indexes/mesh" ;
+    text:entityMap <#entMap> ;
+    text:storeValues false ;
+    ## text:analyzer[ a text:StandardAnalyzer ] ;
+    text:analyzer [
+       a text:ConfigurableAnalyzer ;
+       text:tokenizer text:StandardTokenizer ;
+       text:filters (
+           text:ASCIIFoldingFilter
+           text:LowerCaseFilter
+           # text:PorterStemFilter
+           )
+       ] ;
+    ## text:queryAnalyzer [ a text:KeywordAnalyzer ] ;
+    text:queryParser text:AnalyzingQueryParser ;
+    ## text:defineAnalyzers [ . . . ] ;
+    text:multilingualSupport true ;
+    ## https://jena.apache.org/documentation/query/text-query.html#lists-of-indexed-properties - available since Jena 5.0
+    text:propLists (
+    [ text:propListProp mesht:queryDef ;
+          text:props (
+             rdfs:label
+               meshv:identifier
+               meshv:prefLabel
+               meshv:altLabel
+               meshv:casn1_label
+               meshv:abbreviation
+               meshv:registryNumber
+               meshv:relatedRegistryNumber
+                 mesht:identifier
+                 mesht:prefLabel
+                 mesht:altLabel
+             ) ;
+    ]
+    [ text:propListProp mesht:queryAll ;
+          text:props (
+             rdfs:label
+               meshv:identifier
+               meshv:prefLabel
+               meshv:altLabel
+               meshv:casn1_label
+               meshv:abbreviation
+               meshv:registryNumber
+               meshv:relatedRegistryNumber
+                 mesht:identifier
+                 mesht:prefLabel
+                 mesht:altLabel
+                    mesht:translatorsNote
+                    mesht:annotation
+                    mesht:historyNote
+                    mesht:scopeNote
+                meshv:annotation
+                meshv:historyNote
+                meshv:note
+                meshv:onlineNote
+                meshv:publicMeSHNote
+                meshv:scopeNote
+                # meshv:source
+              ) ;
+    ]
+    [ text:propListProp mesht:queryNotes ;
+          text:props (
+                    mesht:translatorsNote
+                    mesht:annotation
+                    mesht:historyNote
+                    mesht:scopeNote
+                meshv:annotation
+                meshv:historyNote
+                meshv:note
+                meshv:onlineNote
+                meshv:publicMeSHNote
+                meshv:scopeNote
+                # meshv:source
+              ) ;
+    ]
+    ) ;
+     .
+
+<#entMap>
+    a text:EntityMap ;
+    text:defaultField     "label" ;
+    text:entityField      "uri" ;
+    text:uidField         "uid" ;
+    text:langField        "lang" ;
+    text:graphField       "graph" ;
+    text:map (
+         [ text:field "label" ; text:predicate rdfs:label ]
+         [ text:field "abbreviation" ; text:predicate meshv:abbreviation ]
+         [ text:field "annotation" ; text:predicate meshv:annotation ]
+         [ text:field "historyNote" ; text:predicate meshv:historyNote ]
+         [ text:field "identifier" ; text:predicate meshv:identifier ]
+         [ text:field "prefLabel" ; text:predicate meshv:prefLabel ]
+         [ text:field "altLabel" ; text:predicate meshv:altLabel ]
+         [ text:field "casn1_label" ; text:predicate meshv:casn1_label ]
+         [ text:field "registryNumber" ; text:predicate meshv:registryNumber ]
+         [ text:field "relatedRegistryNumber" ; text:predicate meshv:relatedRegistryNumber ]
+         [ text:field "note" ; text:predicate meshv:note ]
+         [ text:field "onlineNote" ; text:predicate meshv:onlineNote ]
+         [ text:field "publicMeSHNote" ; text:predicate meshv:publicMeSHNote ]
+         # [ text:field "source" ; text:predicate meshv:source ]
+         [ text:field "scopeNote" ; text:predicate meshv:scopeNote ]
+         [ text:field "abbreviation_t" ; text:predicate mesht:abbreviation ]
+         [ text:field "annotation_t" ; text:predicate mesht:annotation ]
+         [ text:field "historyNote_t" ; text:predicate mesht:historyNote ]
+         [ text:field "identifier_t" ; text:predicate mesht:identifier ]
+         [ text:field "prefLabel_t" ; text:predicate mesht:prefLabel ]
+         [ text:field "altLabel_t" ; text:predicate mesht:altLabel ]
+         [ text:field "scopeNote_t" ; text:predicate mesht:scopeNote ]
+         [ text:field "translatorsNote" ; text:predicate mesht:translatorsNote ]
+         ) .
+
+### MeSH common:
+## abbreviation
+## annotation
+## historyNote
+## identifier
+## prefLabel
+## altLabel
+## scopeNote
+
+### MeSH master only:
+## rdfs:label
+## meshv:casn1_label
+## meshv:note
+## meshv:onlineNote
+## meshv:publicMeSHNote
+## meshv:source
+
+### Translation only:
+## mesht:translatorsNote
+
+<#service_text_tdb>
+    a fuseki:Service ;
+    rdfs:label                      "MeSH-Translation-service" ;
+    fuseki:name                     "mesh" ;
+    fuseki:serviceQuery             "query" ;
+    fuseki:serviceQuery             "sparql" ;
+    fuseki:serviceUpdate            "update" ;
+    fuseki:serviceUpload            "upload" ;
+    fuseki:serviceReadGraphStore    "get" ;
+    fuseki:serviceReadWriteGraphStore    "data" ;
+    fuseki:dataset                  :text_dataset ;
+    .
+
diff --git a/flask-app/instance/conf/mtw-dist.ini b/flask-app/instance/conf/mtw-dist.ini
index 6ec6dfa..81a54b2 100644
--- a/flask-app/instance/conf/mtw-dist.ini
+++ b/flask-app/instance/conf/mtw-dist.ini
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# *** Config version 1.6.5 ***
+# *** Config version 1.6.9 ***
 ### Important values are marked with !  ###
 ### ! This file MUST BE UTF-8 encoded ! ###
 ### ! Restart the App after modifying ! ###
@@ -21,15 +21,15 @@ SERVER_NAME = test.medvik.cz
 ##   RewriteRule ^/<prefix>/assets-mtw/(.*) /assets-mtw/$1
 
 ### ! Always set ! ###
-TARGET_YEAR = 2024
+TARGET_YEAR = 2025
 
 ### Default previous version year - used for showing modifications ###
-PREV_YEAR_DEF = 2023
-PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023
+PREV_YEAR_DEF = 2024
+PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023,2024
 
 ### Date format:  YYYY-MM-DD ###
-REVISED_AFTER = 2022-01-01
-CREATED_AFTER = 2022-01-01
+REVISED_AFTER = 2023-01-01
+CREATED_AFTER = 2023-01-01
 
 ### ! Always set ! ###
 MARC_LIBCODE = CZ-PrNML
@@ -99,6 +99,8 @@ GCSP = {"script-src":  "'self' ",
 
 CHAR_NORM_FILE = norm_chars_table.tsv.txt
 
+### Uncomment only if using Jena +5.0 - use text:propLists defined in mesh.ttl - default: False
+USE_PROP_LISTS = True
 
 [worker]
 ### MTW Worker API settings - required !
@@ -110,7 +112,7 @@ API_TIMEOUT = 10
 API_TOKEN_MAX_AGE = 10
 
 #API_AUTH_BASIC_USER = test
-#API_AUTH_BASIC_PWD = test 
+#API_AUTH_BASIC_PWD = test
 
 [sparqlconf]
 
diff --git a/flask-app/instance/conf/mtw.ini b/flask-app/instance/conf/mtw.ini
index e8aa7c9..23c4d75 100644
--- a/flask-app/instance/conf/mtw.ini
+++ b/flask-app/instance/conf/mtw.ini
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# *** Config version 1.6.5 ***
+# *** Config version 1.6.9 ***
 ### Important values are marked with !  ###
 ### ! This file MUST BE UTF-8 encoded ! ###
 ### ! Restart the App after modifying ! ###
@@ -14,15 +14,15 @@
 #SERVER_NAME = 127.0.0.1:5900
 
 ### ! Always set ! ###
-TARGET_YEAR = 2024
+TARGET_YEAR = 2025
 
 ### Default previous version year - used for showing modifications ###
-PREV_YEAR_DEF = 2023
-PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023
+PREV_YEAR_DEF = 2024
+PREV_YEARS = 2015,2016,2017,2018,2019,2020,2021,2022,2023,2024
 
 ### Date format:  YYYY-MM-DD ###
-REVISED_AFTER = 2022-01-01
-CREATED_AFTER = 2022-01-01
+REVISED_AFTER = 2023-01-01
+CREATED_AFTER = 2023-01-01
 
 ### ! Always set ! ###
 MARC_LIBCODE = CZ-PrNML
@@ -79,8 +79,8 @@ CSRF_COOKIE_SECURE = False
 ### Flask-Caching params
 ## See: https://flask-caching.readthedocs.io/en/latest/
 
-#CACHING = {"CACHE_TYPE": "null"}
-CACHING = {"CACHE_DEFAULT_TIMEOUT": 1800, "CACHE_THRESHOLD": 500}
+CACHING = {"CACHE_TYPE": "null"}
+#CACHING = {"CACHE_DEFAULT_TIMEOUT": 1800, "CACHE_THRESHOLD": 500}
 
 ### Flask-Session params
 ## See: https://flasksession.readthedocs.io/en/latest/
@@ -101,6 +101,8 @@ GCSP = {"script-src":  "'self' ",
 
 CHAR_NORM_FILE = norm_chars_table.tsv.txt
 
+### Uncomment only if using Jena +5.0 - use text:propLists defined in mesh.ttl - default: False
+USE_PROP_LISTS = True
 
 [worker]
 ### MTW Worker API settings - required !
@@ -113,7 +115,7 @@ API_TIMEOUT = 10
 API_TOKEN_MAX_AGE = 10
 
 #API_AUTH_BASIC_USER = test
-#API_AUTH_BASIC_PWD = test 
+#API_AUTH_BASIC_PWD = test
 
 [sparqlconf]
 
diff --git a/flask-app/mtw-server.py b/flask-app/mtw-server.py
index 869a5f4..ef6926b 100644
--- a/flask-app/mtw-server.py
+++ b/flask-app/mtw-server.py
@@ -14,7 +14,7 @@
 DEFAULT_PREFIX = 'mtw'
 
 appname = 'mtw-server'
-appdesc = 'MTW Server 1.6.8'
+appdesc = 'MTW Server 1.6.9'
 appusage = 'Help:  ' + appname + ' -h \n'
 appauthor = 'Filip Kriz'
 
diff --git a/flask-app/mtw_requirements.txt b/flask-app/mtw_requirements.txt
index 64484b8..0a14cd1 100644
--- a/flask-app/mtw_requirements.txt
+++ b/flask-app/mtw_requirements.txt
@@ -1,4 +1,4 @@
-### Version 1.6.8
+### Version 1.6.9
 ### Python 3.12 ###
 arrow==1.3.0
 bcrypt==4.2.1 ## NOT python-bcrypt !!!
@@ -10,7 +10,7 @@ colorama==0.4.6
 diff_match_patch==20241021
 Flask==3.1.0
 Flask-Caching==2.3.0
-# Flask-Limiter==3.9.2
+# Flask-Limiter==3.10.1  ## NOT used yet
 Flask-Paranoid==0.3.0
 Flask-SeaSurf==2.0.0
 Flask-Session==0.8.0
@@ -24,14 +24,12 @@ pip_audit==2.7.3 ## Run: pip freeze > requirements.txt ; pip-audit ; pip-audit -
 pyuca==1.2
 requests==2.32.3
 requests_futures==1.0.2
-setuptools==75.6.0
 urllib3==1.26.20
 waitress==3.0.2
 Werkzeug==3.1.3
-wheel==0.45.1
 ### (optional) If building for Windows:
 pyinstaller==6.11.1; sys_platform == "win32"
-pyinstaller-hooks-contrib==2024.10; sys_platform == "win32"
+pyinstaller-hooks-contrib==2025.0; sys_platform == "win32"
 ## Install pywin32
 pywin32==308; sys_platform == "win32"
 ## and run in CMD as Admin with activated VENV (!):
diff --git a/flask-app/tools/mesh-nt2trx.py b/flask-app/tools/mesh-nt2trx.py
index 0b90880..c2bbd6a 100644
--- a/flask-app/tools/mesh-nt2trx.py
+++ b/flask-app/tools/mesh-nt2trx.py
@@ -6,35 +6,41 @@
 import gzip
 from timeit import default_timer as timer
 
-appname = 'mesh-nt2trx'
-appversion = '1.5.1 14-5-2024'
-appdesc = 'Extracting translation dataset from Fuseki backup dump'
-appusage = 'Help:   ' + appname + '.py -h \n'
-appauthor = 'Filip Kriz'
+appname = "mesh-nt2trx"
+appversion = "1.5.1 14-5-2024"
+appdesc = "Extracting translation dataset from Fuseki backup dump"
+appusage = "Help:   " + appname + ".py -h \n"
+appauthor = "Filip Kriz"
 
-mesht_prefix = 'http://www.medvik.cz/schema/mesh/vocab/#'
+mesht_prefix = "http://www.medvik.cz/schema/mesh/vocab/#"
 
 
 def main():
 
-    print('\n')
-    print('********************************************')
-    print('*  ', appname, appversion)
-    print('********************************************')
-    print('*  ', appdesc)
-    print('*  ', appusage)
-    print('*   Author:  ', appauthor)
-    print('********************************************\n')
-
-    parser = argparse.ArgumentParser(description=appdesc, prog=appname, usage='%(prog)s inputFile [options]')
-    parser.add_argument('inputFile', type=str, help='MTW dump file name (plain or gzipped)')
-    parser.add_argument('--out', type=str, default='mtw-trx', help='Output file name prefix')
+    print("\n")
+    print("********************************************")
+    print("*  ", appname, appversion)
+    print("********************************************")
+    print("*  ", appdesc)
+    print("*  ", appusage)
+    print("*   Author:  ", appauthor)
+    print("********************************************\n")
+
+    parser = argparse.ArgumentParser(
+        description=appdesc, prog=appname, usage="%(prog)s inputFile [options]"
+    )
+    parser.add_argument(
+        "inputFile", type=str, help="MTW dump file name (plain or gzipped)"
+    )
+    parser.add_argument(
+        "--out", type=str, default="mtw-trx", help="Output file name prefix"
+    )
 
     args, unknown = parser.parse_known_args()
 
     if unknown:
-        print('ERROR : Uknown arguments : ', unknown)
-        print('Try : ' + appname + '.py -h')
+        print("ERROR : Uknown arguments : ", unknown)
+        print("Try : " + appname + ".py -h")
 
     else:
         inFile = os.path.normpath(args.inputFile)
@@ -42,38 +48,38 @@ def main():
         if os.path.isfile(inFile):
             getSubset(inFile, args.out)
         else:
-            print('ERROR : Input file NOT found : ', args.inputFile)
+            print("ERROR : Input file NOT found : ", args.inputFile)
 
 
 def getSubset(inputFile, outputFile):
 
     t0 = timer()
-    startTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    startDate = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d')
+    startTime = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d_%H-%M-%S")
+    startDate = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d")
 
-    outputFile = outputFile + '_' + startDate + '.nt.gz'
+    outputFile = outputFile + "_" + startDate + ".nt.gz"
 
-    print('Started     : ', startTime, '\n')
-    print('Input file  : ', inputFile)
-    print('mesht       : ', mesht_prefix)
-    print('Output file : ', outputFile)
-    print('\n')
+    print("Started     : ", startTime, "\n")
+    print("Input file  : ", inputFile)
+    print("mesht       : ", mesht_prefix)
+    print("Output file : ", outputFile)
+    print("\n")
 
-    head = '### MeSH translation dataset extracted from Fuseki backup dump ###\n'
+    head = "### MeSH translation dataset extracted from Fuseki backup dump ###\n"
     writeOutputGzip(outputFile, head)
 
     result = getSubsetFrom(inputFile, outputFile)
-    print('\n', result)
+    print("\n", result)
 
     # endTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    et = ('\nElapsed time : ' + str((timer() - t0) / 60) + ' min\n')
+    et = "\nElapsed time : " + str((timer() - t0) / 60) + " min\n"
     print(et)
 
 
 def getSubsetFrom(inputFile, outputFile):
 
     result = {}
-    mesht_pred = ' <' + mesht_prefix
+    mesht_pred = " <" + mesht_prefix
 
     count = 0
     found = 0
@@ -84,12 +90,12 @@ def getSubsetFrom(inputFile, outputFile):
     ext = os.path.splitext(inputFile)[1]
     fext = ext.lower()
 
-    print('Processing ...')
+    print("Processing ...")
 
-    if fext == '.gz':
-        fh = gzip.open(inputFile, mode='rt', encoding='utf-8')
+    if fext == ".gz":
+        fh = gzip.open(inputFile, mode="rt", encoding="utf-8")
     else:
-        fh = open(inputFile, mode='r', encoding='utf-8')
+        fh = open(inputFile, mode="r", encoding="utf-8")
 
     s = io.StringIO()
 
@@ -102,27 +108,27 @@ def getSubsetFrom(inputFile, outputFile):
             s.write(line)
 
         if batch == bsize:
-            writeOutputGzip(outputFile, s.getvalue(), mode='at')
+            writeOutputGzip(outputFile, s.getvalue(), mode="at")
             batch = 0
             s.close()
             s = io.StringIO()
 
     fh.close()
-    writeOutputGzip(outputFile, s.getvalue(), mode='at')
+    writeOutputGzip(outputFile, s.getvalue(), mode="at")
     s.close()
 
-    result['triplesCount'] = count
-    result['triplesFound'] = found
+    result["triplesCount"] = count
+    result["triplesFound"] = found
 
-    print('... DONE!')
+    print("... DONE!")
     return result
 
 
-def writeOutputGzip(outputFile, fdata, mode='wt'):
+def writeOutputGzip(outputFile, fdata, mode="wt"):
 
-    with gzip.open(outputFile, mode=mode, encoding='utf-8') as ft:
+    with gzip.open(outputFile, mode=mode, encoding="utf-8") as ft:
         ft.write(fdata)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/flask-app/tools/mesh-trx2nt.py b/flask-app/tools/mesh-trx2nt.py
index ec22255..d2c4783 100644
--- a/flask-app/tools/mesh-trx2nt.py
+++ b/flask-app/tools/mesh-trx2nt.py
@@ -8,40 +8,52 @@
 import uuid
 from timeit import default_timer as timer
 
-appname = 'mesh-trx2nt'
-appversion = '1.1.1 14-5-2024'
-appdesc = 'Extracting translation dataset from NLM UMLS text file [trans_only_2023_expanded.txt]'
-appusage = 'Help:   ' + appname + '.py -h \n'
-appauthor = 'Filip Kriz'
+appname = "mesh-trx2nt"
+appversion = "1.1.1 14-5-2024"
+appdesc = "Extracting translation dataset from NLM UMLS text file [trans_only_2023_expanded.txt]"
+appusage = "Help:   " + appname + ".py -h \n"
+appauthor = "Filip Kriz"
 
-mesh_prefix = 'http://id.nlm.nih.gov/mesh/'
-mesht_prefix = 'http://www.medvik.cz/schema/mesh/vocab/#'
+mesh_prefix = "http://id.nlm.nih.gov/mesh/"
+mesht_prefix = "http://www.medvik.cz/schema/mesh/vocab/#"
 
 custom_concepts = {}
 
 
 def main():
 
-    print('\n')
-    print('********************************************')
-    print('*  ', appname, appversion)
-    print('********************************************')
-    print('*  ', appdesc)
-    print('*  ', appusage)
-    print('*   Author:  ', appauthor)
-    print('********************************************\n')
-
-    parser = argparse.ArgumentParser(description=appdesc, prog=appname, usage='%(prog)s inputFile langCode meshxPrefix [options]')
-    parser.add_argument('inputFile', type=str, help='NLM UMLS text file name (plain or gzipped)')
-    parser.add_argument('langCode', type=str, help='Language code')
-    parser.add_argument('meshxPrefix', type=str, help='MeSH Translation namespace prefix ie. http://my.mesh.com/id/ ')
-    parser.add_argument('--out', type=str, default='mesh-trx', help='Output file name prefix')
+    print("\n")
+    print("********************************************")
+    print("*  ", appname, appversion)
+    print("********************************************")
+    print("*  ", appdesc)
+    print("*  ", appusage)
+    print("*   Author:  ", appauthor)
+    print("********************************************\n")
+
+    parser = argparse.ArgumentParser(
+        description=appdesc,
+        prog=appname,
+        usage="%(prog)s inputFile langCode meshxPrefix [options]",
+    )
+    parser.add_argument(
+        "inputFile", type=str, help="NLM UMLS text file name (plain or gzipped)"
+    )
+    parser.add_argument("langCode", type=str, help="Language code")
+    parser.add_argument(
+        "meshxPrefix",
+        type=str,
+        help="MeSH Translation namespace prefix ie. http://my.mesh.com/id/ ",
+    )
+    parser.add_argument(
+        "--out", type=str, default="mesh-trx", help="Output file name prefix"
+    )
 
     args, unknown = parser.parse_known_args()
 
     if unknown:
-        print('ERROR : Uknown arguments : ', unknown)
-        print('Try : ' + appname + '.py -h')
+        print("ERROR : Uknown arguments : ", unknown)
+        print("Try : " + appname + ".py -h")
 
     else:
         inFile = os.path.normpath(args.inputFile)
@@ -49,35 +61,35 @@ def main():
         if os.path.isfile(inFile):
             procFile(inFile, args.meshxPrefix, args.out, args.langCode)
         else:
-            print('ERROR : Input file NOT found : ', args.inputFile)
+            print("ERROR : Input file NOT found : ", args.inputFile)
 
 
 def procFile(inputFile, meshxPrefix, outputFile, lang_tag):
 
     t0 = timer()
-    startTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    startDate = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d')
+    startTime = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d_%H-%M-%S")
+    startDate = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d")
 
     meshx_prefix = meshxPrefix
 
-    outputFile = outputFile + '-' + lang_tag + '_' + startDate + '.nt.gz'
+    outputFile = outputFile + "-" + lang_tag + "_" + startDate + ".nt.gz"
 
-    print('Started     : ', startTime, '\n')
-    print('Input file  : ', inputFile)
-    print('Lang code   : ', lang_tag)
-    print('mesht       : ', mesht_prefix)
-    print('meshx       : ', meshx_prefix)
-    print('Output file : ', outputFile)
-    print('\n')
+    print("Started     : ", startTime, "\n")
+    print("Input file  : ", inputFile)
+    print("Lang code   : ", lang_tag)
+    print("mesht       : ", mesht_prefix)
+    print("meshx       : ", meshx_prefix)
+    print("Output file : ", outputFile)
+    print("\n")
 
-    head = '### MeSH translation dataset extracted from NLM UMLS text file ###\n'
+    head = "### MeSH translation dataset extracted from NLM UMLS text file ###\n"
     writeOutputGzip(outputFile, head)
 
     result = parse_file(inputFile, outputFile, meshx_prefix, lang_tag, startDate)
-    print('\n', result)
+    print("\n", result)
 
     # endTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    et = ('\nElapsed time : ' + str((timer() - t0) / 60) + ' min\n')
+    et = "\nElapsed time : " + str((timer() - t0) / 60) + " min\n"
     print(et)
 
 
@@ -90,13 +102,13 @@ def parse_file(inputFile, outputFile, meshx_prefix, lang_tag, startDate):
 
     docs = []
 
-    print('Processing ...')
+    print("Processing ...")
 
-    result['LanguageTag'] = lang_tag
+    result["LanguageTag"] = lang_tag
 
     for line in readData(inputFile):
 
-        if recCount == 0 and line[0] == 'DescriptorUI':
+        if recCount == 0 and line[0] == "DescriptorUI":
             # Skip headers if present
             pass
         else:
@@ -115,16 +127,30 @@ def parse_file(inputFile, outputFile, meshx_prefix, lang_tag, startDate):
     # for row in docs:
     #     print(row)
 
-    result['rowCount'] = recCount
+    result["rowCount"] = recCount
 
-    print('... DONE!')
+    print("... DONE!")
     return result
 
 
 def getTriples(line, lang_tag, meshx_prefix, startDate):
     triples = []
 
-    DescriptorUI, ConceptUI, Language, TermType, Term, TermUI, ScopeNote, Tree, Created, Relation, ParentCUI = line
+    (
+        DescriptorUI,
+        ConceptUI,
+        Language,
+        TermType,
+        Term,
+        TermUI,
+        ScopeNote,
+        Tree,
+        Created,
+        Relation,
+        ParentCUI,
+    ) = line
+
+    not_used = [Language, TermUI, Tree]  # noqa: F841
 
     csub = mesh_prefix + ConceptUI
     obj = meshx_prefix + str(uuid.uuid4())
@@ -132,7 +158,7 @@ def getTriples(line, lang_tag, meshx_prefix, startDate):
     if not Created:
         Created = startDate
 
-    if ConceptUI.startswith('F'):
+    if ConceptUI.startswith("F"):
 
         if custom_concepts.get(ConceptUI):
             ccid = custom_concepts.get(ConceptUI)
@@ -142,50 +168,58 @@ def getTriples(line, lang_tag, meshx_prefix, startDate):
 
         ccsub = meshx_prefix + ccid
 
-        if TermType == 'PEP':
+        if TermType == "PEP":
             dsub = mesh_prefix + DescriptorUI
             csub = mesh_prefix + ParentCUI
 
-            triples.append(getTriple(dsub, 'concept', ccsub))
+            triples.append(getTriple(dsub, "concept", ccsub))
             triples.append(getTriple(csub, getRelationPredicate(Relation), ccsub))
-            triples.append(getTriple(ccsub, 'identifier', ConceptUI, literal=True))
-            triples.append(getTriple(ccsub, 'preferredTerm', obj))
+            triples.append(getTriple(ccsub, "identifier", ConceptUI, literal=True))
+            triples.append(getTriple(ccsub, "preferredTerm", obj))
 
             if ScopeNote:
-                triples.append(getTriple(ccsub, 'scopeNote', ScopeNote, literal=True, lang_tag=lang_tag))
+                triples.append(
+                    getTriple(
+                        ccsub, "scopeNote", ScopeNote, literal=True, lang_tag=lang_tag
+                    )
+                )
 
-        elif TermType == 'ET':
-            triples.append(getTriple(ccsub, 'term', obj))
+        elif TermType == "ET":
+            triples.append(getTriple(ccsub, "term", obj))
 
     else:
-        if TermType in ['MH', 'PEP']:
-            triples.append(getTriple(csub, 'preferredTerm', obj))
+        if TermType in ["MH", "PEP"]:
+            triples.append(getTriple(csub, "preferredTerm", obj))
 
             if ScopeNote:
-                triples.append(getTriple(csub, 'scopeNote', ScopeNote, literal=True, lang_tag=lang_tag))
+                triples.append(
+                    getTriple(
+                        csub, "scopeNote", ScopeNote, literal=True, lang_tag=lang_tag
+                    )
+                )
 
-        elif TermType == 'ET':
-            triples.append(getTriple(csub, 'term', obj))
+        elif TermType == "ET":
+            triples.append(getTriple(csub, "term", obj))
 
-    triples.append(getTriple(obj, 'prefLabel', Term, literal=True, lang_tag=lang_tag))
-    triples.append(getTriple(obj, 'dateCreated', Created, date=True))
+    triples.append(getTriple(obj, "prefLabel", Term, literal=True, lang_tag=lang_tag))
+    triples.append(getTriple(obj, "dateCreated", Created, date=True))
 
     return triples
 
 
 def getRelationPredicate(Relation):
-    if Relation == 'RB':
-        return 'broaderConcept'
-    elif Relation == 'RN':
-        return 'narrowerConcept'
-    elif Relation == 'RO':
-        return 'relatedConcept'
+    if Relation == "RB":
+        return "broaderConcept"
+    elif Relation == "RN":
+        return "narrowerConcept"
+    elif Relation == "RO":
+        return "relatedConcept"
     else:
-        return 'narrowerConcept'
+        return "narrowerConcept"
 
 
 def getTriple(sub, pred, obj, literal=False, date=False, lang_tag=None):
-    sub = '<' + sub + '>'
+    sub = "<" + sub + ">"
     if literal:
         if lang_tag:
             return sub + getMesht(pred) + '"' + sanitize_input(obj) + '"@' + lang_tag
@@ -193,19 +227,25 @@ def getTriple(sub, pred, obj, literal=False, date=False, lang_tag=None):
             return sub + getMesht(pred) + '"' + sanitize_input(obj) + '"'
 
     if date:
-        return sub + getMesht(pred) + '"' + obj + '"^^<http://www.w3.org/2001/XMLSchema#date>'
+        return (
+            sub
+            + getMesht(pred)
+            + '"'
+            + obj
+            + '"^^<http://www.w3.org/2001/XMLSchema#date>'
+        )
 
-    return sub + getMesht(pred) + '<' + obj + '>'
+    return sub + getMesht(pred) + "<" + obj + ">"
 
 
 def getMesht(predicate):
-    return ' <' + mesht_prefix + predicate + '> '
+    return " <" + mesht_prefix + predicate + "> "
 
 
 def sanitize_input(text):
     t = text.strip()
-    t = ' '.join(t.split())
-    t = t.replace('?', '')
+    t = " ".join(t.split())
+    t = t.replace("?", "")
     t = t.replace('"', '\\"')
     return t
 
@@ -217,28 +257,28 @@ def readData(input_file):
     data = []
 
     try:
-        if fext == '.gz':
-            with gzip.open(input_file, mode='rt', encoding='utf-8') as fh:
-                tsv_file = csv.reader(fh, delimiter='\t', quotechar=None)
+        if fext == ".gz":
+            with gzip.open(input_file, mode="rt", encoding="utf-8") as fh:
+                tsv_file = csv.reader(fh, delimiter="\t", quotechar=None)
                 for line in tsv_file:
                     if len(line):
-                        if line[0].startswith('#'):
+                        if line[0].startswith("#"):
                             pass
                         else:
                             data.append(line)
 
-        if fext == '.txt':
-            with open(input_file, mode='r', encoding='utf-8') as fh:
-                tsv_file = csv.reader(fh, delimiter='\t', quotechar=None)
+        if fext == ".txt":
+            with open(input_file, mode="r", encoding="utf-8") as fh:
+                tsv_file = csv.reader(fh, delimiter="\t", quotechar=None)
                 for line in tsv_file:
                     if len(line):
-                        if line[0].startswith('#'):
+                        if line[0].startswith("#"):
                             pass
                         else:
                             data.append(line)
 
     except:  # noqa: E722
-        print('ERROR reading file : ', input_file)
+        print("ERROR reading file : ", input_file)
         raise
 
     return data
@@ -248,16 +288,16 @@ def flushTriples(outputFile, docs):
     s = io.StringIO()
 
     for line in docs:
-        s.write(line+' .\n')
+        s.write(line + " .\n")
 
-    writeOutputGzip(outputFile, s.getvalue(), mode='at')
+    writeOutputGzip(outputFile, s.getvalue(), mode="at")
     s.close()
 
 
-def writeOutputGzip(outputFile, fdata, mode='wt'):
-    with gzip.open(outputFile, mode=mode, encoding='utf-8') as ft:
+def writeOutputGzip(outputFile, fdata, mode="wt"):
+    with gzip.open(outputFile, mode=mode, encoding="utf-8") as ft:
         ft.write(fdata)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/flask-app/tools/mesh-xml2trx.py b/flask-app/tools/mesh-xml2trx.py
index 774d87d..26b2651 100644
--- a/flask-app/tools/mesh-xml2trx.py
+++ b/flask-app/tools/mesh-xml2trx.py
@@ -7,37 +7,49 @@
 from timeit import default_timer as timer
 import xml.etree.ElementTree as ET
 
-appname = 'mesh-xml2trx'
-appversion = '1.5.1 14-5-2024'
-appdesc = 'Extracting translation dataset from MeSH XML'
-appusage = 'Help:   ' + appname + '.py -h \n'
-appauthor = 'Filip Kriz'
+appname = "mesh-xml2trx"
+appversion = "1.5.1 14-5-2024"
+appdesc = "Extracting translation dataset from MeSH XML"
+appusage = "Help:   " + appname + ".py -h \n"
+appauthor = "Filip Kriz"
 
-mesh_prefix = 'http://id.nlm.nih.gov/mesh/'
-mesht_prefix = 'http://www.medvik.cz/schema/mesh/vocab/#'
+mesh_prefix = "http://id.nlm.nih.gov/mesh/"
+mesht_prefix = "http://www.medvik.cz/schema/mesh/vocab/#"
 
 
 def main():
 
-    print('\n')
-    print('********************************************')
-    print('*  ', appname, appversion)
-    print('********************************************')
-    print('*  ', appdesc)
-    print('*  ', appusage)
-    print('*   Author:  ', appauthor)
-    print('********************************************\n')
-
-    parser = argparse.ArgumentParser(description=appdesc, prog=appname, usage='%(prog)s inputFile meshxPrefix [options]')
-    parser.add_argument('inputFile', type=str, help='MeSH XML file name (plain or gzipped)')
-    parser.add_argument('meshxPrefix', type=str, help='MeSH Translation namespace prefix ie. http://my.mesh.com/id/ ')
-    parser.add_argument('--out', type=str, default='mesh-trx', help='Output file name prefix')
+    print("\n")
+    print("********************************************")
+    print("*  ", appname, appversion)
+    print("********************************************")
+    print("*  ", appdesc)
+    print("*  ", appusage)
+    print("*   Author:  ", appauthor)
+    print("********************************************\n")
+
+    parser = argparse.ArgumentParser(
+        description=appdesc,
+        prog=appname,
+        usage="%(prog)s inputFile meshxPrefix [options]",
+    )
+    parser.add_argument(
+        "inputFile", type=str, help="MeSH XML file name (plain or gzipped)"
+    )
+    parser.add_argument(
+        "meshxPrefix",
+        type=str,
+        help="MeSH Translation namespace prefix ie. http://my.mesh.com/id/ ",
+    )
+    parser.add_argument(
+        "--out", type=str, default="mesh-trx", help="Output file name prefix"
+    )
 
     args, unknown = parser.parse_known_args()
 
     if unknown:
-        print('ERROR : Uknown arguments : ', unknown)
-        print('Try : ' + appname + '.py -h')
+        print("ERROR : Uknown arguments : ", unknown)
+        print("Try : " + appname + ".py -h")
 
     else:
         inFile = os.path.normpath(args.inputFile)
@@ -45,34 +57,34 @@ def main():
         if os.path.isfile(inFile):
             getSubset(inFile, args.meshxPrefix, args.out)
         else:
-            print('ERROR : Input file NOT found : ', args.inputFile)
+            print("ERROR : Input file NOT found : ", args.inputFile)
 
 
 def getSubset(inputFile, meshxPrefix, outputFile):
 
     t0 = timer()
-    startTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    startDate = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d')
+    startTime = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d_%H-%M-%S")
+    startDate = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d")
 
     meshx_prefix = meshxPrefix
 
-    outputFile = outputFile + '_' + startDate + '.nt.gz'
+    outputFile = outputFile + "_" + startDate + ".nt.gz"
 
-    print('Started     : ', startTime, '\n')
-    print('Input file  : ', inputFile)
-    print('mesht       : ', mesht_prefix)
-    print('meshx       : ', meshx_prefix)
-    print('Output file : ', outputFile)
-    print('\n')
+    print("Started     : ", startTime, "\n")
+    print("Input file  : ", inputFile)
+    print("mesht       : ", mesht_prefix)
+    print("meshx       : ", meshx_prefix)
+    print("Output file : ", outputFile)
+    print("\n")
 
-    head = '### MeSH translation dataset extracted from MeSH XML ###\n'
+    head = "### MeSH translation dataset extracted from MeSH XML ###\n"
     writeOutputGzip(outputFile, head)
 
     result = parse_xml(inputFile, outputFile, meshx_prefix)
-    print('\n', result)
+    print("\n", result)
 
     # endTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
-    et = ('\nElapsed time : ' + str((timer() - t0) / 60) + ' min\n')
+    et = "\nElapsed time : " + str((timer() - t0) / 60) + " min\n"
     print(et)
 
 
@@ -85,18 +97,18 @@ def parse_xml(inputFile, outputFile, meshx_prefix):
 
     docs = []
 
-    print('Processing ...')
+    print("Processing ...")
     try:
         root = getRoot(inputFile)
     except:  # noqa: E722
         raise
 
-    lang_code = root.attrib['LanguageCode']
+    lang_code = root.attrib["LanguageCode"]
     lang_tag = getLangTag(lang_code)
-    result['LanguageCode'] = lang_code
-    result['LanguageTag'] = lang_tag
+    result["LanguageCode"] = lang_code
+    result["LanguageTag"] = lang_tag
 
-    for rec in root.findall('DescriptorRecord'):
+    for rec in root.findall("DescriptorRecord"):
         recCount += 1
         batch += 1
 
@@ -115,121 +127,137 @@ def parse_xml(inputFile, outputFile, meshx_prefix):
 
     root.clear()
 
-    result['recordsCount'] = recCount
+    result["recordsCount"] = recCount
 
-    print('... DONE!')
+    print("... DONE!")
     return result
 
 
 def getTriples(rec, lang_code, lang_tag, meshx_prefix):
     triples = []
 
-    dui = rec.find('DescriptorUI').text.strip()
-    dsub = '<' + mesh_prefix + dui + '>'
+    dui = rec.find("DescriptorUI").text.strip()
+    dsub = "<" + mesh_prefix + dui + ">"
 
-    for concept in rec.findall('ConceptList/Concept'):
+    for concept in rec.findall("ConceptList/Concept"):
 
-        cui = concept.find('ConceptUI').text.strip()
+        cui = concept.find("ConceptUI").text.strip()
         # cpref = concept.attrib['PreferredConceptYN']
 
-        cui = concept.find('ConceptUI').text.strip()
-        if cui.startswith('F'):
-            csub = '<' + meshx_prefix + cui + '>'
-            triples.append(dsub + getMesht('concept') + csub)
-            triples.append(csub + getMesht('identifier') + '"' + cui + '"')
-
-            rels = concept.find('ConceptRelationList/ConceptRelation')
-            rel = rels.attrib['RelationName']
-
-            if rel == 'NRW':
-                relPred = 'narrowerConcept'
-            elif rel == 'BRD':
-                relPred = 'narrowerConcept'
-            elif rel == 'REL':
-                relPred = 'relatedConcept'
+        cui = concept.find("ConceptUI").text.strip()
+        if cui.startswith("F"):
+            csub = "<" + meshx_prefix + cui + ">"
+            triples.append(dsub + getMesht("concept") + csub)
+            triples.append(csub + getMesht("identifier") + '"' + cui + '"')
+
+            rels = concept.find("ConceptRelationList/ConceptRelation")
+            rel = rels.attrib["RelationName"]
+
+            if rel == "NRW":
+                relPred = "narrowerConcept"
+            elif rel == "BRD":
+                relPred = "narrowerConcept"
+            elif rel == "REL":
+                relPred = "relatedConcept"
             else:
-                relPred = ''
+                relPred = ""
 
             if relPred:
-                sub = '<' + mesh_prefix + rels.find('Concept1UI').text.strip() + '>'
+                sub = "<" + mesh_prefix + rels.find("Concept1UI").text.strip() + ">"
                 pred = getMesht(relPred)
-                obj = '<' + meshx_prefix + rels.find('Concept2UI').text.strip() + '>'
+                obj = "<" + meshx_prefix + rels.find("Concept2UI").text.strip() + ">"
                 triples.append(sub + pred + obj)
 
         else:
-            csub = '<' + mesh_prefix + cui + '>'
+            csub = "<" + mesh_prefix + cui + ">"
 
-        trxScn = concept.find('TranslatorsScopeNote')
+        trxScn = concept.find("TranslatorsScopeNote")
         if trxScn is not None:
             scn = sanitize_input(trxScn.text)
-            triples.append(csub + getMesht('scopeNote') + '"' + scn + '"@' + lang_tag)
+            triples.append(csub + getMesht("scopeNote") + '"' + scn + '"@' + lang_tag)
 
-        for term in concept.findall('TermList/Term'):
+        for term in concept.findall("TermList/Term"):
 
-            prefTerm = term.attrib['ConceptPreferredTermYN']
+            prefTerm = term.attrib["ConceptPreferredTermYN"]
 
-            tui = term.find('TermUI').text.strip()
+            tui = term.find("TermUI").text.strip()
             if tui.startswith(lang_code):
-                tsub = '<' + meshx_prefix + tui + '>'
+                tsub = "<" + meshx_prefix + tui + ">"
 
-                if prefTerm == 'Y':
-                    triples.append(csub + getMesht('preferredTerm') + tsub)
+                if prefTerm == "Y":
+                    triples.append(csub + getMesht("preferredTerm") + tsub)
                 else:
-                    triples.append(csub + getMesht('term') + tsub)
+                    triples.append(csub + getMesht("term") + tsub)
 
-                label_raw = term.find('String').text
+                label_raw = term.find("String").text
                 label = sanitize_input(label_raw)
-                triples.append(tsub + getMesht('prefLabel') + '"' + label + '"@' + lang_tag)
-
-                if term.attrib['LexicalTag'] != 'NON':
-                    row = tsub + getMesht('lexicalTag') + '"' + term.attrib['LexicalTag'] + '"'
+                triples.append(
+                    tsub + getMesht("prefLabel") + '"' + label + '"@' + lang_tag
+                )
+
+                if term.attrib["LexicalTag"] != "NON":
+                    row = (
+                        tsub
+                        + getMesht("lexicalTag")
+                        + '"'
+                        + term.attrib["LexicalTag"]
+                        + '"'
+                    )
                     triples.append(row)
 
-                dateCrt = term.find('DateCreated')
-                row = tsub + getMesht('dateCreated') + getDate(dateCrt)
+                dateCrt = term.find("DateCreated")
+                row = tsub + getMesht("dateCreated") + getDate(dateCrt)
                 triples.append(row)
 
-                dateRev = term.find('DateRevised')
+                dateRev = term.find("DateRevised")
                 if dateRev:
-                    row = tsub + getMesht('dateUpdated') + getDate(dateRev)
+                    row = tsub + getMesht("dateUpdated") + getDate(dateRev)
                     triples.append(row)
 
-                triples.append(tsub + getMesht('identifier') + '"' + tui + '"')
+                triples.append(tsub + getMesht("identifier") + '"' + tui + '"')
 
     return triples
 
 
 def getMesht(predicate):
-    return ' <' + mesht_prefix + predicate + '> '
+    return " <" + mesht_prefix + predicate + "> "
 
 
 def sanitize_input(text):
     t = text.strip()
-    t = ' '.join(t.split())
-    t = t.replace('?', '')
+    t = " ".join(t.split())
+    t = t.replace("?", "")
     t = t.replace('"', '\\"')
     return t
 
 
 def getDate(node):
-    year = node.find('Year').text.strip()
-    month = node.find('Month').text.strip()
-    day = node.find('Day').text.strip()
-    return '"' + year + '-' + month + '-' + day + '"^^<http://www.w3.org/2001/XMLSchema#date>'
+    year = node.find("Year").text.strip()
+    month = node.find("Month").text.strip()
+    day = node.find("Day").text.strip()
+    return (
+        '"'
+        + year
+        + "-"
+        + month
+        + "-"
+        + day
+        + '"^^<http://www.w3.org/2001/XMLSchema#date>'
+    )
 
 
 def getLangTag(lang_code):
     lang_dict = {
-        'cze': 'cs',
-        'fre': 'fr',
-        'ger': 'de',
-        'ita': 'it',
-        'nor': 'no',
-        'por': 'pt',
-        'scr': 'hr',
-        'spa': 'es'
+        "cze": "cs",
+        "fre": "fr",
+        "ger": "de",
+        "ita": "it",
+        "nor": "no",
+        "por": "pt",
+        "scr": "hr",
+        "spa": "es",
     }
-    return lang_dict.get(lang_code.lower(), 'xx')
+    return lang_dict.get(lang_code.lower(), "xx")
 
 
 def getRoot(input_file):
@@ -238,16 +266,16 @@ def getRoot(input_file):
     tree = None
 
     try:
-        if fext == '.gz':
-            with gzip.open(input_file, mode='rt', encoding='utf-8') as fh:
+        if fext == ".gz":
+            with gzip.open(input_file, mode="rt", encoding="utf-8") as fh:
                 tree = ET.parse(fh)
 
-        if fext == '.xml':
-            with open(input_file, mode='r', encoding='utf-8') as fh:
+        if fext == ".xml":
+            with open(input_file, mode="r", encoding="utf-8") as fh:
                 tree = ET.parse(fh)
 
     except:  # noqa: E722
-        print('ERROR reading file : ', input_file)
+        print("ERROR reading file : ", input_file)
         raise
 
     if tree:
@@ -259,16 +287,16 @@ def flushTriples(outputFile, docs):
     s = io.StringIO()
 
     for line in docs:
-        s.write(line+' .\n')
+        s.write(line + " .\n")
 
-    writeOutputGzip(outputFile, s.getvalue(), mode='at')
+    writeOutputGzip(outputFile, s.getvalue(), mode="at")
     s.close()
 
 
-def writeOutputGzip(outputFile, fdata, mode='wt'):
-    with gzip.open(outputFile, mode=mode, encoding='utf-8') as ft:
+def writeOutputGzip(outputFile, fdata, mode="wt"):
+    with gzip.open(outputFile, mode=mode, encoding="utf-8") as ft:
         ft.write(fdata)
 
 
-if __name__ == '__main__':
+if __name__ == "__main__":
     main()
diff --git a/flask-app/tools/secrets-gen.py b/flask-app/tools/secrets-gen.py
new file mode 100644
index 0000000..eeebd1f
--- /dev/null
+++ b/flask-app/tools/secrets-gen.py
@@ -0,0 +1,14 @@
+import os
+import secrets
+
+print("\n")
+
+print("SECRET_KEY: ")
+print(os.urandom(24))
+
+print("\n")
+
+print("SECRET_TOKEN_OR_SALT: ")
+print(secrets.token_urlsafe())
+
+print("\n")
diff --git a/flask-app/tools/update-ns.py b/flask-app/tools/update-ns.py
new file mode 100644
index 0000000..a0421a3
--- /dev/null
+++ b/flask-app/tools/update-ns.py
@@ -0,0 +1,128 @@
+# -*- coding: utf-8 -*-
+import os
+import argparse
+import datetime
+import io
+import gzip
+from timeit import default_timer as timer
+
+appname = "mesh-nt-update-ns"
+appversion = "1.0.1 22-1-2025"
+appdesc = "Update MeSH namespace"
+appusage = "Help:   " + appname + ".py -h \n"
+appauthor = "Filip Kriz"
+
+# mesh_ns_prefix = 'http://id.nlm.nih.gov/mesh/'
+
+
+def main():
+
+    print("\n")
+    print("********************************************")
+    print("*  ", appname, appversion)
+    print("********************************************")
+    print("*  ", appdesc)
+    print("*  ", appusage)
+    print("*   Author:  ", appauthor)
+    print("********************************************\n")
+
+    parser = argparse.ArgumentParser(
+        description=appdesc, prog=appname, usage="%(prog)s inputFile"
+    )
+    parser.add_argument("inputFile", type=str, help="MeSH N-Triples input file")
+    parser.add_argument("ns_old", help="Namespace URI")
+    parser.add_argument("ns_new", help="New namespace URI")
+    parser.add_argument("outputFile", type=str, help="Output file")
+    # parser.add_argument('--add-active', help='Add status active=true triples', action='store_true')
+
+    args, unknown = parser.parse_known_args()
+
+    if unknown:
+        print("ERROR : Uknown arguments : ", unknown)
+        print("Try : " + appname + ".py -h")
+
+    else:
+        inFile = os.path.normpath(args.inputFile)
+
+        if os.path.isfile(inFile):
+            getOutput(inFile, args.ns_old, args.ns_new, args.outputFile)
+        else:
+            print("ERROR : Input file NOT found : ", args.inputFile)
+
+
+def getOutput(inputFile, ns_old, ns_new, outputFile):
+
+    t0 = timer()
+    startTime = datetime.datetime.strftime(datetime.datetime.now(), "%Y-%m-%d_%H-%M-%S")
+
+    print("Started     : ", startTime, "\n")
+    print("Input file  : ", inputFile)
+    print("NS Old      : ", ns_old)
+    print("NS New      : ", ns_new)
+    print("Output file : ", outputFile)
+    print("\n")
+
+    head = f"### Replaced {ns_old} with {ns_new} ###\n"
+    writeOutputGzip(outputFile, head)
+
+    result = updateNS(inputFile, ns_old, ns_new, outputFile)
+    print("\n", result)
+
+    # endTime = datetime.datetime.strftime(datetime.datetime.now(), '%Y-%m-%d_%H-%M-%S')
+    et = "\nElapsed time : " + str((timer() - t0) / 60) + " min\n"
+    print(et)
+
+
+def updateNS(inputFile, ns_old, ns_new, outputFile):
+    result = {}
+    mesh_ns_old = "<" + ns_old
+    mesh_ns_new = "<" + ns_new
+
+    count = 0
+    batch = 0
+    bsize = 64000
+
+    ext = os.path.splitext(inputFile)[1]
+    fext = ext.lower()
+
+    print("Processing ... ")
+
+    if fext == ".gz":
+        fh = gzip.open(inputFile, mode="rt", encoding="utf-8")
+    else:
+        fh = open(inputFile, mode="r", encoding="utf-8")
+
+    s = io.StringIO()
+
+    for line in fh:
+        count += 1
+        batch += 1
+        s.write(line.replace(mesh_ns_old, mesh_ns_new))
+
+        if batch == bsize:
+            writeOutputGzip(outputFile, s.getvalue())
+            batch = 0
+            s.close()
+            s = io.StringIO()
+
+    fh.close()
+
+    if s.getvalue():
+        writeOutputGzip(outputFile, s.getvalue())
+
+    s.close()
+
+    result["triplesCount"] = count
+
+    print("... DONE!")
+    return result
+
+
+def writeOutputGzip(outputFile, fdata, mode="wt"):
+
+    with gzip.open(outputFile, mode=mode, encoding="utf-8") as ft:
+        ft.write(fdata)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/sparql/exports/lookups_base.sparql b/sparql/exports/lookups_base.sparql
index fd28218..29b7993 100644
--- a/sparql/exports/lookups_base.sparql
+++ b/sparql/exports/lookups_base.sparql
@@ -26,7 +26,10 @@ WHERE {
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
   ?d meshv:identifier ?dui .
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   ?d meshv:dateCreated ?crt .
   ?d meshv:dateEstablished ?est .
   OPTIONAL {
@@ -64,3 +67,4 @@ WHERE {
 }
 GROUP BY ?dui ?cui ?dtype ?den ?trx ?notrx ?active ?crt ?est ?nlm ?rn ?cas
 ###LIMIT 100
+
diff --git a/sparql/exports/lookups_base_qualifs.sparql b/sparql/exports/lookups_base_qualifs.sparql
index 958874c..9d0e3d1 100644
--- a/sparql/exports/lookups_base_qualifs.sparql
+++ b/sparql/exports/lookups_base_qualifs.sparql
@@ -14,13 +14,20 @@ WHERE {
   BIND(mesh:D005123 as ?d)
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag))
-  ?d meshv:active ?actived .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?actived) .
+
   FILTER(?actived)
   ?d meshv:identifier ?dui .
   ?d meshv:allowableQualifier ?q .
-  ##?q meshv:active ?activeq .
+
+  # Assume absence of meshv:active as true
+  ##BIND(IF(EXISTS { ?q meshv:active false }, false, true) AS ?activeq) .
   ##FILTER(?activeq)
+  
   ?q meshv:identifier ?qui
 }
 GROUP BY ?dui
 ### LIMIT 100
+
diff --git a/sparql/exports/lookups_terms.sparql b/sparql/exports/lookups_terms.sparql
index a5e36ab..935232a 100644
--- a/sparql/exports/lookups_terms.sparql
+++ b/sparql/exports/lookups_terms.sparql
@@ -22,16 +22,20 @@ WHERE {
   BIND(mesh:D018806 as ?d)
   ?d rdf:type ?dtype .
   FILTER(?dtype IN(meshv:TopicalDescriptor,meshv:GeographicalDescriptor,meshv:PublicationType,meshv:CheckTag,meshv:Qualifier))
-  ?d meshv:active ?active .
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
   ##FILTER(?active)
   ?d meshv:identifier ?dui .
   ?d meshv:preferredConcept ?c .
-  ##?c meshv:active ?activec .
+
+  # Assume absence of meshv:active as true
+  ##BIND(IF(EXISTS { ?c meshv:active false }, false, true) AS ?activec) .
   ##FILTER(?activec)
 
   OPTIONAL {
     ?c meshv:term ?pt .
-    ##?pt meshv:active ?activet .
+    # Assume absence of meshv:active as true
+    ##BIND(IF(EXISTS { ?pt meshv:active false }, false, true) AS ?activet) .
     ##FILTER(?activet)
     ?pt meshv:prefLabel ?pterm
   }
@@ -43,23 +47,25 @@ WHERE {
 
   OPTIONAL {
     ?d meshv:concept ?ct .
-    ##?ct meshv:active ?activec1 .
+    # Assume absence of meshv:active as true
+    ##BIND(IF(EXISTS { ?ct meshv:active false }, false, true) AS ?activec1) .
     ##FILTER(?activec1)
     ?ct meshv:term|meshv:preferredTerm ?nt .
-    ##?nt meshv:active ?activet1 .
+    ##BIND(IF(EXISTS { ?nt meshv:active false }, false, true) AS ?activet1) .
     ##FILTER(?activet1)
     ?nt meshv:prefLabel ?nterm
   }
 
   OPTIONAL {
     ?d meshv:concept|mesht:concept ?cct .
-    ##OPTIONAL { ?cct mesht:active ?activec2 }
+    ##BIND(IF(EXISTS { ?cct meshv:active false }, false, true) AS ?activec2) .
     ##FILTER(!BOUND(?activec2))
     ?cct mesht:term|mesht:preferredTerm ?ntx .
-    ##OPTIONAL { ?ntx meshv:active ?activet2 }
+    ##BIND(IF(EXISTS { ?ntx meshv:active false }, false, true) AS ?activet2) .
     ##FILTER(!BOUND(?activet2))
     ?ntx mesht:prefLabel ?ntermx
   }
 }
 GROUP BY ?dui ?active
 LIMIT 100
+
diff --git a/sparql/exports/lookups_use_instead.sparql b/sparql/exports/lookups_use_instead.sparql
index 691dc38..32d30a5 100644
--- a/sparql/exports/lookups_use_instead.sparql
+++ b/sparql/exports/lookups_use_instead.sparql
@@ -12,7 +12,8 @@ SELECT ?dui (GROUP_CONCAT(DISTINCT ?o ; separator='|') AS ?qn)
 WHERE {
   BIND(mesh:D004364 as ?d)
   ?dq meshv:hasDescriptor ?d .
-  ?dq meshv:active ?active .
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?dq meshv:active false }, false, true) AS ?active) .
   FILTER(?active)
   ?d meshv:identifier ?dui .
   ?dq meshv:useInstead ?ud .
@@ -23,3 +24,4 @@ WHERE {
 }
 GROUP BY ?dui
 LIMIT 100
+
diff --git a/sparql/query_lastActive.sparql b/sparql/query_lastActive.sparql
index 1c99e24..3a4f054 100644
--- a/sparql/query_lastActive.sparql
+++ b/sparql/query_lastActive.sparql
@@ -11,8 +11,9 @@ PREFIX meshcs: <http://mesh.medvik.cz/link/>
 SELECT distinct ?type
 {
   ?s meshv:lastActiveYear ?last . # "2017"@en .
-  ?s meshv:active ?active .
+  BIND(IF(EXISTS { ?s meshv:active false }, false, true) AS ?active) .
   ?s rdf:type ?type .
   #?s rdf:type meshv:TopicalDescriptor
 
 } ORDER BY ?p LIMIT 1000
+
diff --git a/sparql/query_search.sparql b/sparql/query_search.sparql
index 1b825a9..600bbd3 100644
--- a/sparql/query_search.sparql
+++ b/sparql/query_search.sparql
@@ -67,7 +67,8 @@ ORDER BY DESC(?score)
   }
   ?d rdfs:label ?label .
   FILTER ( lang(?label) = 'en' )
-  ?d meshv:active ?active .
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
   ?d meshv:preferredConcept ?c .
   ?d meshv:dateCreated ?dateCrt .
   OPTIONAL {?d meshv:dateRevised ?dateRev }
diff --git a/sparql/query_tree-browse.sparql b/sparql/query_tree-browse.sparql
index bb42330..1ac0a5f 100644
--- a/sparql/query_tree-browse.sparql
+++ b/sparql/query_tree-browse.sparql
@@ -32,7 +32,10 @@ WHERE {
   ?tn rdfs:label ?tnlabel .
   ?d rdf:type ?type .
   ?d rdfs:label ?label .
-  ?d meshv:active ?active .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+  
   ?d meshv:dateCreated ?dateCrt .
   OPTIONAL { ?d meshv:dateRevised ?dateRev }
   ?d meshv:preferredConcept ?c .
diff --git a/sparql/query_tree.sparql b/sparql/query_tree.sparql
index 6b9cb51..4a1a597 100644
--- a/sparql/query_tree.sparql
+++ b/sparql/query_tree.sparql
@@ -47,9 +47,12 @@ WHERE {
   }
 ORDER BY ?tn LIMIT 500
 }
-    ?d rdfs:label ?label .
-    ?d rdf:type ?type .
-    ?d meshv:active ?active .
+  ?d rdfs:label ?label .
+  ?d rdf:type ?type .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
    OPTIONAL {
         ?c mesht:preferredTerm ?id .
         ?id mesht:prefLabel ?val
@@ -63,3 +66,4 @@ ORDER BY ?tn LIMIT 500
     OPTIONAL {?c mesht:notTranslatable ?ntx}
     FILTER (lang(?label) = 'en')
 }
+
diff --git a/sparql/stats/query_check_prefterm_missing.sparql b/sparql/stats/query_check_prefterm_missing.sparql
index 1d419e2..0fc6008 100644
--- a/sparql/stats/query_check_prefterm_missing.sparql
+++ b/sparql/stats/query_check_prefterm_missing.sparql
@@ -18,8 +18,11 @@ WHERE {
   ?c meshv:identifier|mesht:identifier ?cui .
   ?c mesht:term|mesht:preferredTerm ?t .
   ?c rdfs:label ?label .
+
+  # Assume absence of meshv:active as true
+  BIND(IF(EXISTS { ?d meshv:active false }, false, true) AS ?active) .
+
   OPTIONAL { ?c mesht:preferredTerm ?pt }
-  OPTIONAL { ?d meshv:active ?active }
   OPTIONAL { ?d mesht:lockedBy ?lockedBy }
   OPTIONAL { ?c mesht:notTranslatable ?ntx }
   FILTER (!BOUND(?ntx))  
@@ -28,3 +31,4 @@ WHERE {
   FILTER(NOT EXISTS { ?c mesht:preferredTerm ?pt })
 }
 #LIMIT 100 
+