fix(code): Update code following refactor of tables (closes #4604)