Fixed highlighting when match is in parts