Fixed Set display bug, added match index