fix(code): Update code following refactor of tables (refs #4603)
Merge pull request #3 from eguaj/3.3-A4603

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