Added good matching with missing pt disambiguation