Made highlighting endchar inclusive