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