Fixing matches view issues.