JAL-2629 fix incorrect mapping between HMM and columns after move