Add non-whole word supported

Users now can highlight not just whole word now