Improve current match highlighting for star-search (#3)