WIP: remove "table_id" from value ids