Move hiera interpolation to where regular interplotion is done