wikimaker changes for NormaliseByCurrent re #6485

Signed-off-by: Karl Palmen <karl.palmen@stfc.ac.uk>