Fixed match database errors