EMPIREDB-282
Code cleanup and small MenuListTag bugfix
2 files changed