diff --git a/Ccs/ccs_function_lib.py b/Ccs/ccs_function_lib.py
index 36e388a13ad5a466b0b30ec3fae867e21cb10f71..b0eeb73625d4cf4e47cde136678432b41d6813bd 100644
--- a/Ccs/ccs_function_lib.py
+++ b/Ccs/ccs_function_lib.py
@@ -2720,7 +2720,7 @@ def get_tm_id(pcf_descr=None):
                                          'ON pcf_curtx = txf_numbr '
                                          'LEFT JOIN txp '
                                          'ON txf_numbr = txp.txp_numbr '
-                                         'WHERE ccf_descr="{}"'.format(ccf_descr)).fetchall()
+                                         'WHERE pcf_descr="{}"'.format(pcf_descr)).fetchall()
 
     scoped_session_idb.close()
 
@@ -2735,11 +2735,14 @@ def get_tm_id(pcf_descr=None):
 def get_data_pool_items(pcf_descr = None):
     if pcf_descr is None:
         data_pool = scoped_session_idb.execute('SELECT pcf_pid, pcf_descr, pcf_ptc, pcf_pfc '
-                                         'FROM pcf').fetchall()
+                                         'FROM pcf '
+                                        'WHERE pcf_pid <> 0').fetchall()
 
     else:
         data_pool = scoped_session_idb.execute('SELECT pcf_pid, pcf_descr, pcf_ptc, pcf_pfc '
-                                         'FROM pcf'.format(ccf_descr)).fetchall()
+                                         'FROM pcf '
+                                        'WHERE pcf_pid <> 0 '
+                                        'WHERE pcf_descr="{}"'.format(pcf_descr)).fetchall()
 
     scoped_session_idb.close()
 
diff --git a/Ccs/s2k_partypes.py b/Ccs/s2k_partypes.py
index d4c368c33b68face8987dbc50c56a05e5447c102..4329205317e0479ad1c0b6e93a7493273f58150f 100644
--- a/Ccs/s2k_partypes.py
+++ b/Ccs/s2k_partypes.py
@@ -36,7 +36,7 @@ ptt = {
         11: 'uint11', 12: 'uint12', 13: 'uint13', 14: 'uint14', 15: 'uint15', 16: 'H', 17: 'uint17', 18: 'uint18',
         19: 'uint19', 20: 'uint20', 21: 'uint21', 22: 'uint22', 23: 'uint23', 24: 'I24', 25: 'uint25', 26: 'uint26',
         27: 'uint27', 28: 'uint28', 29: 'uint29', 30: 'uint30', 31: 'uint31', 32: 'I'},
-    7: {0: 'vOCT', 1: 'placeholder', 12: 'placeholder', 382: '382s'},
+    7: {0: 'vOCT', 1: '1s', 12: '12s', 382: '382s'},
     8: {0: 'vASCII', 382: '382s'},
     9: {17: 'CUC917', 18: 'CUC918'},
     11: {0: 'deduced'},
diff --git a/Tst/tst/data_pool_tab.py b/Tst/tst/data_pool_tab.py
index 24b3df3f199c9cfd10bf276d836cd259fb652198..263f3c036d3433c7509df2a3a8f27eb7322130e3 100644
--- a/Tst/tst/data_pool_tab.py
+++ b/Tst/tst/data_pool_tab.py
@@ -37,8 +37,6 @@ def get_data_pool_sublist():
     return data_pool_sublist, pid_list
 
 data_pool_sublist, pid_list = get_data_pool_sublist()
-print(data_pool_sublist)
-print(pid_list)