Improve query, now maybe too strict on romaji matches