Added cluster number and id to the dot export. Fixes (TOP-10) affects (TOP-12).