SCI-680: add index column into expression table and rearrange columns