msc: Fix some queries count calculus, rename step labels