Added label in match info and fixed minor bug