Fix dashboard query
Align flags on dashboard