Issue 172 sort diags keys