Minor changes to labels and results ordering