MIFOSX-365: Simplify 'Data Tables' functionality