Fix match list UI issue