EMPIREDB-367 DataList fixes
9 files changed