diff --git a/tsg_util/headerForm.m b/tsg_util/headerForm.m
index fffe891c32559f9c91243b8a6fd777898a35c10a..3b571ca87032f2eeab80faa8569b7d59b91e2c4f 100644
--- a/tsg_util/headerForm.m
+++ b/tsg_util/headerForm.m
@@ -78,8 +78,8 @@ for i=1:numel(nca_keys)
     'TooltipString', char(s.comment), ...
     'String', char(s.name) );
   
-  % display dynamic uicontrol 
-  % -------------------------
+  % display dynamically uicontrol 
+  % -----------------------------
   ui = uicontrol(...
     'Parent', hHeaderFig, ...
     'Units', 'normalized', ...
@@ -173,20 +173,19 @@ uiwait(hHeaderFig);
 %% Nested callback
   function continueCallback(obj, event)
     
-    % get uicontrol filelds and populate tsg structure
+    % get uicontrol fields and populate tsg structure
     % ------------------------------------------------
+    % for text only
+    % -------------
     tsg.PLATFORM_NAME     = get(data.PLATFORM_NAME, 'string');
     tsg.SHIP_CALL_SIGN    = get(data.SHIP_CALL_SIGN, 'string');
     tsg.SHIP_MMSI         = get(data.SHIP_MMSI, 'string');
     tsg.TSG_TYPE          = get(data.TSG_TYPE, 'string');
-    tsg.TSG_TYPE          = tsg.TSG_TYPE(get(data.TSG_TYPE, 'value'),:);
     tsg.TSG_NUMBER        = get(data.TSG_NUMBER, 'string');
     tsg.TINT_TYPE         = get(data.TINT_TYPE, 'string');
-    tsg.TINT_TYPE         = tsg.TINT_TYPE(get(data.TINT_TYPE, 'value'),:);
     tsg.TINT_NUMBER       = get(data.TINT_NUMBER, 'string');
     tsg.DATA_TYPE         = get(data.DATA_TYPE, 'string');
     tsg.DATA_MODE         = get(data.DATA_MODE, 'string');
-    tsg.DATA_MODE         = tsg.DATA_MODE(get(data.DATA_MODE, 'value'),:);
     tsg.SAMPLING_PERIOD   = get(data.SAMPLING_PERIOD, 'string');
     tsg.PROCESSING_STATUS = get(data.PROCESSING_STATUS, 'string');
     tsg.DATE_START        = get(data.DATE_START, 'string');
@@ -206,7 +205,16 @@ uiwait(hHeaderFig);
     tsg.DATA_ACQUISITION  = get(data.DATA_ACQUISITION, 'string');
     tsg.PROCESSING_CENTRE = get(data.PROCESSING_CENTRE, 'string');
     tsg.PROCESSING_STATES = get(data.PROCESSING_STATES, 'string');
-
+    
+    % for popupmenu only
+    % ------------------
+    tsg.TSG_TYPE          = tsg.TSG_TYPE(get(data.TSG_TYPE, 'value'),:);
+    tsg.TINT_TYPE         = tsg.TINT_TYPE(get(data.TINT_TYPE, 'value'),:);
+    tsg.DATA_MODE         = tsg.DATA_MODE(get(data.DATA_MODE, 'value'),:);
+    tsg.PI_NAME           = tsg.PI_NAME(get(data.PI_NAME, 'value'),:);
+    tsg.DATA_ACQUISITION  = tsg.DATA_ACQUISITION(get(data.DATA_ACQUISITION, 'value'),:);
+    tsg.PROCESSING_CENTRE = tsg.PROCESSING_CENTRE(get(data.PROCESSING_CENTRE, 'value'),:);
+  
     % Save tsg structure 
     % ------------------
     setappdata( hTsgGUI, 'tsg_data', tsg);