Test romaji and katakana input to highlightQuery
Fix double-highlight bug for furigana and simplify logic