Add labels and sort in catalog