diff --git a/crpptbx/TCV/tcv_requests_mapping.m b/crpptbx/TCV/tcv_requests_mapping.m
index d3a517627cab50105a5d5e539e6d1783ce16ec42..ae6fcc1fd3e789cdf5120c5c19e8b28d67a780ae 100644
--- a/crpptbx/TCV/tcv_requests_mapping.m
+++ b/crpptbx/TCV/tcv_requests_mapping.m
@@ -205,7 +205,7 @@ switch lower(data_request)
                     'params_eff.data_request=''a_minor'';' ...
 		    'gdat_tmp3=gdat_tcv(shot,params_eff);ij=find(gdat_tmp3.data==0);gdat_tmp3.data(ij)=NaN;' ...
 		    'tmp_data3=interp1(gdat_tmp3.t,gdat_tmp3.data,gdat_tmp.t,[],NaN);' ...
-		    'gdat_tmp.data = tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5);' ...
+		    'gdat_tmp.data = abs(tmp_data2*1e-6./pi./(tmp_data3.^2+1e-5));' ...
 		    'ij=find(gdat_tmp.data<0 | gdat_tmp.data>4);gdat_tmp.data(ij)=NaN;gdat_tmp.data = gdat_tmp.data * 1e20;'];
  case {'ngf','greenwald_fraction','f_greenwald','ng_fraction'}
   mapping.timedim = 1;
@@ -265,13 +265,13 @@ switch lower(data_request)
   mapping.label = 'q';
   mapping.method = 'switchcase';
  case 'r_contour'
-  mapping.timedim = 1;
+  mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::r_contour';
   mapping.expression = '\tcv_shot::top.results.equil_1.results:r_rho'; % several flux surfaces R coordinates (irho,itheta,t)
   mapping.expression = 'tcv_eq(''''r_rho'''',''''LIUQE.M'''')';
  case 'r_contour_edge'
-  mapping.timedim = 1;
+  mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::r_contour';
   mapping.expression = '\tcv_shot::top.results.equil_1.results:r_surf'; % LCFS R coordinates (r,t)
@@ -358,13 +358,13 @@ switch lower(data_request)
   mapping.expression = '\tcv_shot::top.results.equil_1.results:w_mhd';
   mapping.expression = 'tcv_eq(''''w_mhd'''',''''LIUQE.M'''')';
  case 'z_contour'
-  mapping.timedim = 1;
+  mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::z_contour';
   mapping.expression = '\tcv_shot::top.results.equil_1.results:z_rho'; % several flux surfaces Z coordinates (irho,itheta,t)
   mapping.expression = 'tcv_eq(''''z_rho'''',''''LIUQE.M'''')';
  case 'z_contour_edge'
-  mapping.timedim = 1;
+  mapping.timedim = 2;
   mapping.method = 'tdiliuqe';
   mapping.expression = '\results::z_contour';
   mapping.expression = '\tcv_shot::top.results.equil_1.results:z_surf'; % LCFS Z coordinates (r,t)