diff --git a/matlab/D3D/d3d_requests_mapping.m b/matlab/D3D/d3d_requests_mapping.m
index 605f31605c3cb84ab7f10349e80c0cdedd28b10f..b58209b9b85675c19cf6070e39054e37a7c38a5b 100644
--- a/matlab/D3D/d3d_requests_mapping.m
+++ b/matlab/D3D/d3d_requests_mapping.m
@@ -91,8 +91,8 @@ switch lower(data_request)
   mapping.timedim = 1;
   mapping.label = {'density_ref','density'};
   mapping.method = 'expression';
-  mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=[{''d3d''},{''ptdata("dstdenp")''}];' ...
-                    'gdat_tmp=gdat_d3d(shot,params_eff);params_eff.data_request=[{''d3d''},{''ptdata("dssdenest")''}];' ...
+  mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=''\dstdenp'';' ...
+                    'gdat_tmp=gdat_d3d(shot,params_eff);params_eff.data_request=''\dssdenest'';' ...
                     'gdat_tmp2=gdat_d3d(shot,params_eff);' ...
 		    'gdat_tmp.data(:,2) = gdat_tmp2.data;' ...
                     'gdat_tmp.dim{2}=[1 2];gdat_tmp.dimunits{1}=''s'';gdat_tmp.dimunits{2}={''dstdenp'',''dssdenest''};' ...
@@ -251,7 +251,8 @@ switch lower(data_request)
   mapping.expression = ['params_eff = gdat_data.gdat_params;params_eff.data_request=[{''d3d''},{''ptdata("pcf2b")''}];' ...
                     'gdat_tmp=gdat_d3d(shot,params_eff);params_eff = gdat_data.gdat_params;' ...
                     'params_eff.data_request=[{''d3d''},{''ptdata("f2b")''}];gdat_tmp2=gdat_d3d(shot,params_eff);' ...
-		    'gdat_tmp.data(:,2) = interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t);' ...
+		    'if ~isempty(gdat_tmp2.t); gdat_tmp.data(:,2) = interp1(gdat_tmp2.t,gdat_tmp2.data,gdat_tmp.t);else;' ...
+                    'gdat_tmp.data(:,2) = NaN(size(gdat_tmp.t)); end;' ...
                     'gdat_tmp.gdat_request=''' data_request ''';'];
  case 'pgyro'
   mapping.timedim = 1;
@@ -425,6 +426,11 @@ switch lower(data_request)
   % extra D3D cases (not necessarily in official data_request name list)
   % %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
   %
+ case {'zxpt1', 'xpt'}
+  mapping.label = 'zxpt1';
+  mapping.timedim = 1;
+  mapping.method = 'signal';
+  mapping.expression = [{'EFIT01'},{'\zxpt1'}];
  case 'transp'
   mapping.label = 'transp output';
   mapping.method = 'switchcase';