SCI-680: change table layout
SCI-680: make indexing consistent between file and expression objects