improved regex for match highlighting