JAL-2591 More rationalising of hiddencols