@vizabi/reader-ddfcsv 4.3.3 → 4.3.5

package/coverage/src/ddf-csv.ts.html

@@ -20,24 +20,24 @@
     </h1>
     <div class='clearfix'>
       <div class='fl pad1y space-right2'>
-        <span class="strong">83.9% </span>
+        <span class="strong">91.22% </span>
         <span class="quiet">Statements</span>
-        <span class='fraction'>323/385</span>
+        <span class='fraction'>374/410</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">71.52% </span>
+        <span class="strong">85.96% </span>
         <span class="quiet">Branches</span>
-        <span class='fraction'>108/151</span>
+        <span class='fraction'>147/171</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">86.89% </span>
+        <span class="strong">92.13% </span>
         <span class="quiet">Functions</span>
-        <span class='fraction'>106/122</span>
+        <span class='fraction'>117/127</span>
       </div>
       <div class='fl pad1y space-right2'>
-        <span class="strong">84.24% </span>
+        <span class="strong">91.3% </span>
         <span class="quiet">Lines</span>
-        <span class='fraction'>310/368</span>
+        <span class='fraction'>357/391</span>
       </div>
     </div>
     <p class="quiet">
@@ -918,8 +918,45 @@
 <a name='L870'></a><a href='#L870'>870</a>
 <a name='L871'></a><a href='#L871'>871</a>
 <a name='L872'></a><a href='#L872'>872</a>
-<a name='L873'></a><a href='#L873'>873</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
+<a name='L873'></a><a href='#L873'>873</a>
+<a name='L874'></a><a href='#L874'>874</a>
+<a name='L875'></a><a href='#L875'>875</a>
+<a name='L876'></a><a href='#L876'>876</a>
+<a name='L877'></a><a href='#L877'>877</a>
+<a name='L878'></a><a href='#L878'>878</a>
+<a name='L879'></a><a href='#L879'>879</a>
+<a name='L880'></a><a href='#L880'>880</a>
+<a name='L881'></a><a href='#L881'>881</a>
+<a name='L882'></a><a href='#L882'>882</a>
+<a name='L883'></a><a href='#L883'>883</a>
+<a name='L884'></a><a href='#L884'>884</a>
+<a name='L885'></a><a href='#L885'>885</a>
+<a name='L886'></a><a href='#L886'>886</a>
+<a name='L887'></a><a href='#L887'>887</a>
+<a name='L888'></a><a href='#L888'>888</a>
+<a name='L889'></a><a href='#L889'>889</a>
+<a name='L890'></a><a href='#L890'>890</a>
+<a name='L891'></a><a href='#L891'>891</a>
+<a name='L892'></a><a href='#L892'>892</a>
+<a name='L893'></a><a href='#L893'>893</a>
+<a name='L894'></a><a href='#L894'>894</a>
+<a name='L895'></a><a href='#L895'>895</a>
+<a name='L896'></a><a href='#L896'>896</a>
+<a name='L897'></a><a href='#L897'>897</a>
+<a name='L898'></a><a href='#L898'>898</a>
+<a name='L899'></a><a href='#L899'>899</a>
+<a name='L900'></a><a href='#L900'>900</a>
+<a name='L901'></a><a href='#L901'>901</a>
+<a name='L902'></a><a href='#L902'>902</a>
+<a name='L903'></a><a href='#L903'>903</a>
+<a name='L904'></a><a href='#L904'>904</a>
+<a name='L905'></a><a href='#L905'>905</a>
+<a name='L906'></a><a href='#L906'>906</a>
+<a name='L907'></a><a href='#L907'>907</a>
+<a name='L908'></a><a href='#L908'>908</a>
+<a name='L909'></a><a href='#L909'>909</a>
+<a name='L910'></a><a href='#L910'>910</a>
+<a name='L911'></a><a href='#L911'>911</a></td><td class="line-coverage quiet"><span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-yes">1x</span>
@@ -930,76 +967,78 @@
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">808770x</span>
+<span class="cline-any cline-yes">826859x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1236242x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">7917818x</span>
+<span class="cline-any cline-yes">3171x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17805x</span>
+<span class="cline-any cline-yes">3249870x</span>
 <span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">438385x</span>
+<span class="cline-any cline-yes">451528x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-yes">370385x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">178520x</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">4946x</span>
+<span class="cline-any cline-yes">3758598x</span>
+<span class="cline-any cline-yes">408x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">46x</span>
-<span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-yes">5543x</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">46x</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">65x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">24x</span>
+<span class="cline-any cline-yes">5530x</span>
+<span class="cline-any cline-yes">5530x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5530x</span>
+<span class="cline-any cline-yes">5530x</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">41x</span>
-<span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5530x</span>
+<span class="cline-any cline-yes">5530x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">39x</span>
-<span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">38x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1x</span>
-<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">5526x</span>
+<span class="cline-any cline-yes">5526x</span>
+<span class="cline-any cline-yes">5524x</span>
+<span class="cline-any cline-yes">5524x</span>
+<span class="cline-any cline-yes">5524x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">2x</span>
+<span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1007,33 +1046,33 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">17574x</span>
-<span class="cline-any cline-yes">364x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">123269x</span>
+<span class="cline-any cline-yes">11482x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1043,32 +1082,32 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">588x</span>
-<span class="cline-any cline-yes">588x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">22755x</span>
+<span class="cline-any cline-yes">22755x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">588x</span>
+<span class="cline-any cline-yes">22755x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">17574x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">123269x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1076,52 +1115,54 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">124x</span>
-<span class="cline-any cline-yes">18186x</span>
+<span class="cline-any cline-yes">11056x</span>
+<span class="cline-any cline-yes">156863x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5536x</span>
+<span class="cline-any cline-yes">5536x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">65x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5536x</span>
+<span class="cline-any cline-yes">5536x</span>
+<span class="cline-any cline-yes">5534x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
+<span class="cline-any cline-yes">5528x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">65x</span>
-<span class="cline-any cline-yes">62x</span>
-<span class="cline-any cline-yes">62x</span>
+<span class="cline-any cline-yes">5516x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">61x</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">5497x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
+<span class="cline-any cline-yes">5497x</span>
+<span class="cline-any cline-yes">5497x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">51x</span>
+<span class="cline-any cline-yes">5497x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">20x</span>
+<span class="cline-any cline-yes">20x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">61x</span>
+<span class="cline-any cline-yes">5516x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1129,44 +1170,44 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">569401x</span>
-<span class="cline-any cline-yes">315536x</span>
-<span class="cline-any cline-yes">315536x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">4379145x</span>
+<span class="cline-any cline-yes">677402x</span>
+<span class="cline-any cline-yes">677402x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1176,16 +1217,16 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">334x</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">273225x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">21220x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">512588x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1193,8 +1234,8 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">25x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1205,57 +1246,57 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">272335x</span>
-<span class="cline-any cline-yes">272335x</span>
-<span class="cline-any cline-yes">272335x</span>
-<span class="cline-any cline-yes">272335x</span>
+<span class="cline-any cline-yes">468381x</span>
+<span class="cline-any cline-yes">468381x</span>
+<span class="cline-any cline-yes">468381x</span>
+<span class="cline-any cline-yes">468381x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">13x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">12x</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">15x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">97x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13204x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16x</span>
-<span class="cline-any cline-yes">26x</span>
-<span class="cline-any cline-yes">26x</span>
+<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">56x</span>
+<span class="cline-any cline-yes">52x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16x</span>
+<span class="cline-any cline-yes">36x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16x</span>
-<span class="cline-any cline-yes">2330570x</span>
-<span class="cline-any cline-yes">3814280x</span>
+<span class="cline-any cline-yes">36x</span>
+<span class="cline-any cline-yes">3683404x</span>
+<span class="cline-any cline-yes">5723346x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">3814280x</span>
-<span class="cline-any cline-yes">1155747x</span>
-<span class="cline-any cline-yes">2658533x</span>
-<span class="cline-any cline-yes">1169398x</span>
+<span class="cline-any cline-yes">5723346x</span>
+<span class="cline-any cline-yes">1706925x</span>
+<span class="cline-any cline-yes">4016421x</span>
+<span class="cline-any cline-yes">1640228x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5425x</span>
+<span class="cline-any cline-yes">336251x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1268,63 +1309,91 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
+<span class="cline-any cline-yes">13350x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
-<span class="cline-any cline-yes">60x</span>
+<span class="cline-any cline-yes">13350x</span>
+<span class="cline-any cline-yes">5620x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">60x</span>
-<span class="cline-any cline-yes">15x</span>
-<span class="cline-any cline-yes">50x</span>
+<span class="cline-any cline-yes">5620x</span>
+<span class="cline-any cline-yes">67x</span>
+<span class="cline-any cline-yes">5584x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
-<span class="cline-any cline-yes">45x</span>
+<span class="cline-any cline-yes">22x</span>
+<span class="cline-any cline-yes">5562x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">35x</span>
+<span class="cline-any cline-yes">28x</span>
+<span class="cline-any cline-yes">5534x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">43x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">20x</span>
+<span class="cline-any cline-yes">5491x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">143x</span>
+<span class="cline-any cline-yes">13350x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">226x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">226x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-yes">7692x</span>
+<span class="cline-any cline-yes">1x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-yes">3x</span>
+<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">30x</span>
-<span class="cline-any cline-yes">30x</span>
-<span class="cline-any cline-yes">9030x</span>
+<span class="cline-any cline-yes">3x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">26480x</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-yes">7689x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">26480x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
-<span class="cline-any cline-yes">10x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">20x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">42x</span>
+<span class="cline-any cline-yes">11638x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">19x</span>
+<span class="cline-any cline-yes">8x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-yes">11x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">23x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1333,62 +1402,62 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">315536x</span>
-<span class="cline-any cline-yes">1470918x</span>
-<span class="cline-any cline-yes">110297x</span>
+<span class="cline-any cline-yes">677402x</span>
+<span class="cline-any cline-yes">2943551x</span>
+<span class="cline-any cline-yes">149832x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">315536x</span>
+<span class="cline-any cline-yes">677402x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2425523x</span>
-<span class="cline-any cline-yes">2278466x</span>
+<span class="cline-any cline-yes">16528323x</span>
+<span class="cline-any cline-yes">16916919x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">2278466x</span>
-<span class="cline-any cline-yes">1643756x</span>
+<span class="cline-any cline-yes">16916919x</span>
+<span class="cline-any cline-yes">9455969x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">634710x</span>
+<span class="cline-any cline-yes">7460950x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">14830x</span>
+<span class="cline-any cline-yes">3232761x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">619880x</span>
+<span class="cline-any cline-yes">4228189x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">27x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">10x</span>
+<span class="cline-any cline-yes">27x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">8x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">5x</span>
+<span class="cline-any cline-yes">19x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">890x</span>
+<span class="cline-any cline-yes">1658x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1396,18 +1465,18 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">128x</span>
+<span class="cline-any cline-yes">13307x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">128x</span>
+<span class="cline-any cline-yes">13307x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">40x</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">5569x</span>
+<span class="cline-any cline-yes">67x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">30x</span>
+<span class="cline-any cline-yes">5533x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">128x</span>
+<span class="cline-any cline-yes">13307x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1417,18 +1486,18 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">376x</span>
-<span class="cline-any cline-yes">376x</span>
+<span class="cline-any cline-yes">26244x</span>
+<span class="cline-any cline-yes">26244x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">376x</span>
-<span class="cline-any cline-yes">39516x</span>
+<span class="cline-any cline-yes">26244x</span>
+<span class="cline-any cline-yes">195161x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">39516x</span>
-<span class="cline-any cline-yes">980x</span>
+<span class="cline-any cline-yes">195161x</span>
+<span class="cline-any cline-yes">27121x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">376x</span>
+<span class="cline-any cline-yes">26244x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1438,21 +1507,21 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">73x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">5570x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">3717x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">95x</span>
-<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">3717x</span>
+<span class="cline-any cline-yes">3926x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">870x</span>
-<span class="cline-any cline-yes">200x</span>
+<span class="cline-any cline-yes">23276x</span>
+<span class="cline-any cline-yes">2616x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1460,13 +1529,13 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">670x</span>
+<span class="cline-any cline-yes">20660x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">40x</span>
-<span class="cline-any cline-yes">95x</span>
+<span class="cline-any cline-yes">1211x</span>
+<span class="cline-any cline-yes">3926x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1475,25 +1544,25 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">2190x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">2190x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">16290x</span>
-<span class="cline-any cline-yes">16290x</span>
+<span class="cline-any cline-yes">28221x</span>
+<span class="cline-any cline-yes">26059x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1505,39 +1574,39 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">396x</span>
-<span class="cline-any cline-yes">67x</span>
+<span class="cline-any cline-yes">37622x</span>
+<span class="cline-any cline-yes">5583x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">494x</span>
+<span class="cline-any cline-yes">12097x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">329x</span>
-<span class="cline-any cline-yes">108x</span>
-<span class="cline-any cline-yes">221x</span>
-<span class="cline-any cline-yes">221x</span>
+<span class="cline-any cline-yes">32039x</span>
+<span class="cline-any cline-yes">13211x</span>
+<span class="cline-any cline-yes">18854x</span>
+<span class="cline-any cline-yes">18854x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">221x</span>
+<span class="cline-any cline-yes">18828x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">221x</span>
-<span class="cline-any cline-yes">220x</span>
-<span class="cline-any cline-yes">285x</span>
+<span class="cline-any cline-yes">18828x</span>
+<span class="cline-any cline-yes">13417x</span>
+<span class="cline-any cline-yes">15222x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">221x</span>
+<span class="cline-any cline-yes">18828x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
@@ -1546,83 +1615,83 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">1194231x</span>
-<span class="cline-any cline-yes">1194231x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">5627691x</span>
+<span class="cline-any cline-yes">5627691x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">13240x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">13240x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1509767x</span>
+<span class="cline-any cline-yes">6305093x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1509767x</span>
-<span class="cline-any cline-yes">5359332x</span>
-<span class="cline-any cline-yes">5032099x</span>
+<span class="cline-any cline-yes">6305093x</span>
+<span class="cline-any cline-yes">23736497x</span>
+<span class="cline-any cline-yes">22892785x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1509767x</span>
+<span class="cline-any cline-yes">6305093x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1194231x</span>
+<span class="cline-any cline-yes">5627691x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1194231x</span>
-<span class="cline-any cline-yes">3561181x</span>
+<span class="cline-any cline-yes">5627691x</span>
+<span class="cline-any cline-yes">19949234x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1194231x</span>
+<span class="cline-any cline-yes">5627691x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">281x</span>
-<span class="cline-any cline-yes">266x</span>
+<span class="cline-any cline-yes">22527x</span>
+<span class="cline-any cline-yes">15986x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15x</span>
-<span class="cline-any cline-yes">15x</span>
-<span class="cline-any cline-yes">70x</span>
-<span class="cline-any cline-yes">2290140x</span>
+<span class="cline-any cline-yes">6541x</span>
+<span class="cline-any cline-yes">6541x</span>
+<span class="cline-any cline-yes">2609x</span>
+<span class="cline-any cline-yes">14291132x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">1145810x</span>
-<span class="cline-any cline-yes">624830x</span>
+<span class="cline-any cline-yes">5707053x</span>
+<span class="cline-any cline-yes">1249640x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">624830x</span>
+<span class="cline-any cline-yes">1249640x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">520980x</span>
+<span class="cline-any cline-yes">4457413x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">70x</span>
+<span class="cline-any cline-yes">2609x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">15x</span>
+<span class="cline-any cline-yes">6541x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">624830x</span>
+<span class="cline-any cline-yes">1249640x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">624830x</span>
-<span class="cline-any cline-yes">624830x</span>
+<span class="cline-any cline-yes">1248546x</span>
+<span class="cline-any cline-yes">1248546x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">1094x</span>
+<span class="cline-any cline-yes">5476x</span>
+<span class="cline-any cline-yes">2901x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">1094x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1650,92 +1719,88 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34128x</span>
+<span class="cline-any cline-yes">308136x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">34128x</span>
-<span class="cline-any cline-yes">34128x</span>
+<span class="cline-any cline-yes">308136x</span>
+<span class="cline-any cline-yes">308136x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9179x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">21x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">21x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
-<span class="cline-any cline-yes">168x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">168x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9308x</span>
+<span class="cline-any cline-yes">9287x</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9287x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25x</span>
-<span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">25x</span>
+<span class="cline-any cline-yes">58x</span>
+<span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">305x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-no">&nbsp;</span>
-<span class="cline-any cline-no">&nbsp;</span>
+<span class="cline-any cline-yes">9200x</span>
+<span class="cline-any cline-yes">9200x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9200x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">9200x</span>
+<span class="cline-any cline-yes">9200x</span>
+<span class="cline-any cline-yes">9200x</span>
+<span class="cline-any cline-yes">18x</span>
+<span class="cline-any cline-yes">18x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">9182x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">41215x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">41215x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">935x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">935x</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">113x</span>
-<span class="cline-any cline-yes">113x</span>
+<span class="cline-any cline-yes">9182x</span>
+<span class="cline-any cline-yes">9182x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-no">&nbsp;</span>
@@ -1747,51 +1812,61 @@
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">17928x</span>
-<span class="cline-any cline-yes">340x</span>
+<span class="cline-any cline-yes">5524x</span>
+<span class="cline-any cline-yes">111742x</span>
+<span class="cline-any cline-yes">33456x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">111742x</span>
+<span class="cline-any cline-yes">391673x</span>
+<span class="cline-any cline-yes">2414x</span>
+<span class="cline-any cline-yes">2414x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">17928x</span>
-<span class="cline-any cline-yes">17928x</span>
+<span class="cline-any cline-yes">391673x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">111742x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">111742x</span>
+<span class="cline-any cline-yes">111742x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-no">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
-<span class="cline-any cline-yes">114x</span>
-<span class="cline-any cline-yes">33840x</span>
-<span class="cline-any cline-yes">33840x</span>
-<span class="cline-any cline-yes">39252x</span>
+<span class="cline-any cline-yes">5524x</span>
+<span class="cline-any cline-yes">16597x</span>
+<span class="cline-any cline-yes">283725x</span>
+<span class="cline-any cline-yes">283725x</span>
+<span class="cline-any cline-yes">350974x</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">283725x</span>
+<span class="cline-any cline-yes">200653x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">83072x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">33840x</span>
-<span class="cline-any cline-yes">33274x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">566x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
+<span class="cline-any cline-yes">5524x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">38x</span>
+<span class="cline-any cline-yes">5543x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-yes">46x</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import * as includes from 'lodash.includes';
-import * as cloneDeep from 'lodash.clonedeep';
 import * as isEmpty from 'lodash.isempty';
 import * as stripBom from 'strip-bom';
 import { getAppropriatePlugin } from './resource-selection-optimizer';
@@ -1802,7 +1877,7 @@ import * as Papa from 'papaparse';
 import { utcParse } from 'd3-time-format';
 import { IBaseReaderOptions, IDatapackage } from './interfaces';
 &nbsp;
-const isValidNumeric = val =&gt; typeof val !== 'number' &amp;&amp; !val ? <span class="branch-0 cbranch-no" title="branch not covered" >false </span>: true;
+const isValidNumeric = val =&gt; typeof val !== 'number' &amp;&amp; !val ? false : true;
 &nbsp;
 export function ddfCsvReader (logger?: any) {
   const internalConcepts = [
@@ -1813,7 +1888,7 @@ export function ddfCsvReader (logger?: any) {
   const operators = new Map([
     /* logical operators */
     [ '$and', (row, predicates) =&gt; predicates.every(p =&gt; applyFilterRow(row, p)) ],
-    [ '$or', <span class="fstat-no" title="function not covered" >(r</span>ow, predicates) =&gt; <span class="cstat-no" title="statement not covered" >predicates.some(<span class="fstat-no" title="function not covered" >p </span>=&gt; <span class="cstat-no" title="statement not covered" >applyFilterRow(row, p))</span> </span>],
+    [ '$or', (row, predicates) =&gt; predicates.some(p =&gt; applyFilterRow(row, p)) ],
     [ '$not', <span class="fstat-no" title="function not covered" >(r</span>ow, predicate) =&gt; <span class="cstat-no" title="statement not covered" >!applyFilterRow(row, predicate) </span>],
     [ '$nor', <span class="fstat-no" title="function not covered" >(r</span>ow, predicates) =&gt; <span class="cstat-no" title="statement not covered" >!predicates.some(<span class="fstat-no" title="function not covered" >p </span>=&gt; <span class="cstat-no" title="statement not covered" >applyFilterRow(row, p))</span> </span>],
 &nbsp;
@@ -1823,9 +1898,9 @@ export function ddfCsvReader (logger?: any) {
     [ '$gt', (rowValue, filterValue) =&gt; isValidNumeric(rowValue) &amp;&amp; rowValue &gt; filterValue ],
     [ '$gte', <span class="fstat-no" title="function not covered" >(r</span>owValue, filterValue) =&gt; <span class="cstat-no" title="statement not covered" >isValidNumeric(rowValue) &amp;&amp; rowValue &gt;= filterValue </span>],
     [ '$lt', (rowValue, filterValue) =&gt; isValidNumeric(rowValue) &amp;&amp; rowValue &lt; filterValue ],
-    [ '$lte', <span class="fstat-no" title="function not covered" >(r</span>owValue, filterValue) =&gt; <span class="cstat-no" title="statement not covered" >isValidNumeric(rowValue) &amp;&amp; rowValue &lt;= filterValue </span>],
+    [ '$lte', (rowValue, filterValue) =&gt; isValidNumeric(rowValue) &amp;&amp; rowValue &lt;= filterValue ],
     [ '$in', (rowValue, filterValue) =&gt; filterValue.has(rowValue) ],
-    [ '$nin', <span class="fstat-no" title="function not covered" >(r</span>owValue, filterValue) =&gt; <span class="cstat-no" title="statement not covered" >!filterValue.has(rowValue) </span>],
+    [ '$nin', (rowValue, filterValue) =&gt; !filterValue.has(rowValue) ],
   ]);
 &nbsp;
   const keyValueLookup = new Map&lt;string, any&gt;();
@@ -1833,14 +1908,16 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
   let optimalFilesSet = [];
   let datapackage;
+  let datapackagePromise;
+  let datasetWithConstraints = false;
 &nbsp;
   function loadDataPackage (baseOptions: IBaseReaderOptions): Promise&lt;IDatapackage&gt; {
     const datapackagePath = getFilePath(baseOptions.basePath);
     const { debug, error } = baseOptions.diagnostic.prepareDiagnosticFor('loadDataPackage');
 &nbsp;
     return new Promise((resolve, reject) =&gt; {
-      if (datapackage) {
-        return resolve(datapackage);
+      <span class="missing-if-branch" title="if path not taken" >I</span>if (datapackage) {
+<span class="cstat-no" title="statement not covered" >        return resolve(datapackage);</span>
       }
 &nbsp;
       baseOptions.fileReader.readText(datapackagePath, (err, data) =&gt; {
@@ -1957,29 +2034,30 @@ export function ddfCsvReader (logger?: any) {
     concepts.forEach(row =&gt; options.conceptsLookup.set(row.concept, row));
   }
 &nbsp;
-  async function query (queryParam, baseOptions: IBaseReaderOptions) {
-    // console.log(JSON.stringify(queryParam, null, '\t'))
+  async function query (queryParam, _baseOptions: IBaseReaderOptions) {
+    const baseOptions = Object.assign({}, _baseOptions);
     const { warning, error } = baseOptions.diagnostic.prepareDiagnosticFor('query');
     let data;
 &nbsp;
     try {
       await validateQueryStructure(queryParam, baseOptions);
-      baseOptions.datapackage = await loadDataPackage(baseOptions);
+      baseOptions.datapackage = await (datapackagePromise || (datapackagePromise = loadDataPackage(baseOptions)));
+      baseOptions.resourcesLookup = resourcesLookup;
       await loadConcepts(queryParam, baseOptions);
       await validateQueryDefinitions(queryParam, baseOptions);
 &nbsp;
       if (isSchemaQuery(queryParam)) {
         data = await querySchema(queryParam, baseOptions);
       } else {
-        const appropriatePlugin = getAppropriatePlugin(queryParam, baseOptions);
+        const appropriatePlugin = datasetWithConstraints &amp;&amp; getAppropriatePlugin(this, queryParam, baseOptions);
 &nbsp;
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (appropriatePlugin) {
-<span class="cstat-no" title="statement not covered" >          optimalFilesSet = [];</span>
-          const files = <span class="cstat-no" title="statement not covered" >await appropriatePlugin.getRecommendedFilesSet();</span>
-<span class="cstat-no" title="statement not covered" >          optimalFilesSet = files;</span>
-<span class="cstat-no" title="statement not covered" >          queryParam.optimalFilesSet = [].concat(files, queryParam.optimalFilesSet);</span>
+        optimalFilesSet = [];
+        if (appropriatePlugin) {
+          const files = await appropriatePlugin.getRecommendedFilesSet();
+          optimalFilesSet = files;
+          queryParam.optimalFilesSet = [].concat(files, queryParam.optimalFilesSet);
 &nbsp;
-<span class="cstat-no" title="statement not covered" >          warning('get custom optimal files list by a plugin', optimalFilesSet);</span>
+          warning('get custom optimal files list by a plugin', optimalFilesSet);
         }
 &nbsp;
         data = await queryData(queryParam, baseOptions);
@@ -1992,7 +2070,8 @@ export function ddfCsvReader (logger?: any) {
     return data;
   }
 &nbsp;
-  function queryData (queryParam, options: IBaseReaderOptions) {
+  function queryData (queryParam, _options: IBaseReaderOptions) {
+    const options = Object.assign({}, _options);
     const { debug } = options.diagnostic.prepareDiagnosticFor('queryData');
     const {
       select: { key = <span class="branch-0 cbranch-no" title="branch not covered" >[],</span> value = [] },
@@ -2049,7 +2128,7 @@ export function ddfCsvReader (logger?: any) {
    */
   function parseTime(result, options: IBaseReaderOptions) {
     const conceptsLookup = options.conceptsLookup;
-    const concepts = Object.keys(result[0] || <span class="branch-1 cbranch-no" title="branch not covered" >{})</span>;
+    const concepts = Object.keys(result[0] || {});
     const timeConcepts = concepts.map(c =&gt; conceptsLookup.get(c) || {}).filter(co =&gt; co.concept_type == 'time');
     timeConcepts.forEach(({ concept }) =&gt; {
       const parse = getTimeParser(concept, options);
@@ -2089,9 +2168,9 @@ export function ddfCsvReader (logger?: any) {
     if (concept == 'time') {
       return tryParse;
     }
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (!parsers[concept]) {
-<span class="cstat-no" title="statement not covered" >      error('No time parser found for time concept: ' + concept);</span>
-<span class="cstat-no" title="statement not covered" >      return <span class="fstat-no" title="function not covered" >str</span> =&gt; <span class="cstat-no" title="statement not covered" >str;</span></span>
+    if (!parsers[concept]) {
+      error('No time parser found for time concept: ' + concept);
+      return str =&gt; str;
     }
     return parsers[concept];
   }
@@ -2103,13 +2182,13 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
     // process ["geo"] or [{"geo": "asc"}] to [{ concept: "geo", direction: 1 }];
     const orderNormalized = orderBy.map(orderPart =&gt; {
-      <span class="missing-if-branch" title="else path not taken" >E</span>if (typeof orderPart === 'string') {
+      if (typeof orderPart === 'string') {
         return { concept: orderPart, direction: 1 };
       } else {
-        const concept = <span class="cstat-no" title="statement not covered" >Object.keys(orderPart)[ 0 ];</span>
-        const direction = (<span class="cstat-no" title="statement not covered" >orderPart[ concept ] === 'asc' ? 1 : -1)</span>;
+        const concept = Object.keys(orderPart)[ 0 ];
+        const direction = (orderPart[ concept ] === 'asc' ? 1 : -1);
 &nbsp;
-<span class="cstat-no" title="statement not covered" >        return { concept, direction };</span>
+        return { concept, direction };
       }
     });
 &nbsp;
@@ -2171,10 +2250,38 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
     return result;
   }
+&nbsp;
+  function patchFilterForOrClause(filter) {
+&nbsp;
+    function processFilter(where) {
+      const whereKeys = Object.keys(where);
+      for (const key of whereKeys) {
+        if (key == "$or") {
+          where[key] = where[key].reduce((res, value) =&gt; {
+            const valueKeys = Object.keys(value);
+            <span class="missing-if-branch" title="if path not taken" >I</span>if (valueKeys.length &gt; 1) {
+<span class="cstat-no" title="statement not covered" >              for (const key of valueKeys) {</span>
+<span class="cstat-no" title="statement not covered" >                res.push({ [key]: value[key] });</span>
+              }
+            } else {
+              res.push(value);
+            }
+            return res;
+          }, []);
+        }
+      }
+      return where;
+    }
+&nbsp;
+    return processFilter(filter);
+  }
 &nbsp;
   function mergeFilters (...filters) {
     return filters.reduce((a, b) =&gt; {
-      a.$and.push(b);
+      if (!isEmpty(b)) {
+        patchFilterForOrClause(b);
+        a.$and.push(b);
+      }
 &nbsp;
       return a;
     }, { $and: [] });
@@ -2191,8 +2298,8 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
     const collection = queryParam.from.split('.')[ 0 ];
 &nbsp;
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (baseOptions.datapackage.ddfSchema[ collection ]) {
-<span class="cstat-no" title="statement not covered" >      return getSchemaFromCollection(collection);</span>
+    if (baseOptions.datapackage.ddfSchema[ collection ]) {
+      return getSchemaFromCollection(collection);
     } else <span class="missing-if-branch" title="else path not taken" >E</span>if (collection === '*') {
       return Object.keys(baseOptions.datapackage.ddfSchema)
         .map(getSchemaFromCollection)
@@ -2252,11 +2359,11 @@ export function ddfCsvReader (logger?: any) {
       return Promise.resolve({ [ joinID ]: join.where });
     } else {
       // entity concept
-      return query({
+      return queryData({
         select: { key: [ join.key ] },
         where: join.where,
         from: options.conceptsLookup.has(join.key) ? 'entities' : <span class="branch-1 cbranch-no" title="branch not covered" >'concepts'</span>
-      }, Object.assign({ joinID }, cloneDeep(options)))
+      }, Object.assign({ joinID }, options))
         .then(result =&gt; ({
           [ joinID ]: {
             [ join.key ]: {
@@ -2327,8 +2434,8 @@ export function ddfCsvReader (logger?: any) {
             return resourceKeySet.has(lookupConcept.concept) &amp;&amp;
               lookupConcept.concept !== concept.concept &amp;&amp; // not the actual concept
               (
-<span class="branch-2 cbranch-no" title="branch not covered" >                lookupConcept.domain === concept.domain </span>||  // other entity sets in entity domain
-<span class="branch-3 cbranch-no" title="branch not covered" >                lookupConcept.concept === concept.domain </span>  // entity domain of the entity set
+                lookupConcept.domain === concept.domain ||  // other entity sets in entity domain
+                lookupConcept.concept === concept.domain   // entity domain of the entity set
               );
           } else {
             // concept_type == "entity_domain"
@@ -2348,10 +2455,10 @@ export function ddfCsvReader (logger?: any) {
    */
   function getEntitySetFilter (conceptStrings, queryParam, options) {
     const promises = filterConceptsByType([ 'entity_set' ], conceptStrings, options)
-      .map(concept =&gt; query({
+      .map(concept =&gt; queryData({
           select: { key: [ concept.domain ], value: [ 'is--' + concept.concept ] },
           from: 'entities'
-        }, Object.assign({}, cloneDeep(options)))
+        }, Object.assign({}, options))
           .then(result =&gt; ({
             [ concept.concept ]:
               {
@@ -2398,7 +2505,7 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
     if (oneKeyOneValueResourcesArray) {
       oneKeyOneValueResourcesArray = oneKeyOneValueResourcesArray
-        .filter(v =&gt; isEmpty(optimalFilesSet) || <span class="branch-1 cbranch-no" title="branch not covered" >includes(optimalFilesSet, v.path))</span>;
+        .filter(v =&gt; isEmpty(optimalFilesSet) || includes(optimalFilesSet, v.path));
     }
 &nbsp;
     return new Set(oneKeyOneValueResourcesArray);
@@ -2486,15 +2593,15 @@ export function ddfCsvReader (logger?: any) {
         /* Simple alternative without empty value or error handling */
         Object.assign(resultRow, sourceRow);
         break;
-<span class="branch-1 cbranch-no" title="branch not covered" >      case 'translation':</span>
+      case 'translation':
         // Translation joining ignores empty values
         // and allows different values for strings (= translations)
-<span class="cstat-no" title="statement not covered" >        for (const concept in sourceRow) {</span>
-<span class="cstat-no" title="statement not covered" >          if (sourceRow[ concept ] !== '') {</span>
-<span class="cstat-no" title="statement not covered" >            resultRow[ concept ] = sourceRow[ concept ];</span>
+        for (const concept in sourceRow) {
+          if (sourceRow[ concept ] !== '') {
+            resultRow[ concept ] = sourceRow[ concept ];
           }
         }
-<span class="cstat-no" title="statement not covered" >        break;</span>
+        break;
 <span class="branch-2 cbranch-no" title="branch not covered" >      case 'overwriteWithError':</span>
         /* Alternative for "overwrite" with JOIN error detection */
 <span class="cstat-no" title="statement not covered" >        for (const concept in sourceRow) {</span>
@@ -2544,25 +2651,25 @@ export function ddfCsvReader (logger?: any) {
     const languageValid = typeof language !== 'undefined' &amp;&amp; includes(getLanguages(options), language);
     const languageLoaded = typeof resource.translations[ language ] !== 'undefined';
 &nbsp;
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (languageValid) {
-<span class="cstat-no" title="statement not covered" >      if (!languageLoaded) {</span>
-        const translationPath = <span class="cstat-no" title="statement not covered" >`lang/${language}/${resource.path}`;</span>
+    if (languageValid) {
+      <span class="missing-if-branch" title="else path not taken" >E</span>if (!languageLoaded) {
+        const translationPath = `lang/${language}/${resource.path}`;
 &nbsp;
         // error loading translation file is expected when specific file is not translated
         // more correct would be to only resolve file-not-found errors but current solution is sufficient
-<span class="cstat-no" title="statement not covered" >        resource.translations[ language ] = loadFile(translationPath, options)</span>
-          .catch(<span class="fstat-no" title="function not covered" >err</span> =&gt; {
-<span class="cstat-no" title="statement not covered" >            warning(`translation file ${translationPath}`, err);</span>
-<span class="cstat-no" title="statement not covered" >            return Promise.resolve({});</span>
+        resource.translations[ language ] = loadFile(translationPath, options)
+          .catch(err =&gt; {
+            warning(`translation file ${translationPath}`, err);
+            return Promise.resolve({});
           });
       }
 &nbsp;
-<span class="cstat-no" title="statement not covered" >      filePromises.push(resource.translations[ language ]);</span>
+      filePromises.push(resource.translations[ language ]);
     }
 &nbsp;
     return Promise.all(filePromises).then(fileResponses =&gt; {
       // resp.data does not exist if translation file not found
-      const filesData = fileResponses.map(resp =&gt; resp.data || <span class="branch-1 cbranch-no" title="branch not covered" >[])</span>;
+      const filesData = fileResponses.map(resp =&gt; resp.data || []);
       const primaryKey = resource.schema.primaryKey;
       const data = joinData(primaryKey, 'translation', ...filesData);
 &nbsp;
@@ -2572,8 +2679,8 @@ export function ddfCsvReader (logger?: any) {
   }
 &nbsp;
   function getLanguages (options: {datapackage}): string[] {
-    <span class="missing-if-branch" title="if path not taken" >I</span>if (!options.datapackage.translations) {
-<span class="cstat-no" title="statement not covered" >      return [];</span>
+    if (!options.datapackage.translations) {
+      return [];
     }
 &nbsp;
     return options.datapackage.translations.map(lang =&gt; lang.id);
@@ -2587,23 +2694,19 @@ export function ddfCsvReader (logger?: any) {
 &nbsp;
     return new Promise((resolve, reject) =&gt; {
       options.fileReader.readText(fullFilePath, (err, data) =&gt; {
-        <span class="missing-if-branch" title="if path not taken" >I</span>if (err) {
-<span class="cstat-no" title="statement not covered" >          error(`fail "${filePath}" reading`, err);</span>
-<span class="cstat-no" title="statement not covered" >          return reject(new DdfCsvError(FILE_READING_ERROR, err, fullFilePath));</span>
+        if (err) {
+          error(`fail "${filePath}" reading`, err);
+          return reject(new DdfCsvError(FILE_READING_ERROR, err, fullFilePath));
         }
 &nbsp;
         Papa.parse(stripBom(data), {
           header: true,
           skipEmptyLines: true,
           dynamicTyping: (headerName) =&gt; {
-            // parsing to number/boolean based on concept type
-            //
-            // can't do dynamic typing without concept types loaded.
-            // concept properties are not parsed in first concept query
-            // reparsing of concepts resource is done in conceptLookup building
+            // skip parsing time/string concept types
             const concept: any = options.conceptsLookup.get(headerName) || {};
 &nbsp;
-            return includes([ 'boolean', 'measure' ], concept.concept_type);
+            return !includes([ 'time', 'string' ], concept.concept_type);
           },
           complete: result =&gt; {
             debug(`finish reading "${filePath}"`);
@@ -2627,6 +2730,15 @@ export function ddfCsvReader (logger?: any) {
       if (!Array.isArray(resource.schema.primaryKey)) {
         resource.schema.primaryKey = [ resource.schema.primaryKey ];
       }
+&nbsp;
+      const constraints = resource.schema.fields.reduce((result, field) =&gt; {
+        if (field.constraints?.enum) {
+          if (!datasetWithConstraints) datasetWithConstraints = true;
+          result[field.name] = field.constraints.enum.map(e =&gt; +e || e);
+        }
+        return result;
+      }, {});
+      resource.constraints = constraints;
 &nbsp;
       resource.translations = {};
       resourcesLookup.set(resource.name, resource);
@@ -2659,7 +2771,9 @@ export function ddfCsvReader (logger?: any) {
   }
 &nbsp;
   return {
-    query
+    query,
+    queryData,
+    loadFile
   };
 }
 &nbsp;</pre></td></tr>
@@ -2668,7 +2782,7 @@ export function ddfCsvReader (logger?: any) {
 </div><!-- /wrapper -->
 <div class='footer quiet pad2 space-top1 center small'>
   Code coverage
-  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Thu May 11 2023 23:59:02 GMT+0200 (Central European Summer Time)
+  generated by <a href="https://istanbul.js.org/" target="_blank">istanbul</a> at Mon Jun 24 2024 00:21:40 GMT+0300 (Moscow Standard Time)
 </div>
 </div>
 <script src="../prettify.js"></script>