Updated findcvar to highlight the matching part of matches