Fix loading match list