Update the handling for WST_ID and CLIM_ID