Repositioning replace to be more safe when redeploying base-config, use...

Repositioning replace to be more safe when redeploying base-config, use variable geant_re_as_number everywhere