fix to show current matches correctly