Redesign match by label