Refactor and show type of match in mode-line