[BUG] Highlight behavior not working as expected for fields with periods (.) as part of their values

[BUG] Highlight behavior not working as expected for fields with periods (.) as part of their values #1066