Minor optimisation to org dashboard