EMPIREDB-362 Some minor fixes and Rework of Advanced example
24 files changed