Test romaji and katakana input to highlightQuery
Fix double-highlight bug for furigana and simplify logic
Make if statements uniform
Merge pull request #53 from gojp/move-highlight-query

Fix double-highlight bug for furigana and simplify logic