Fixed multiword queries and word_* option - closes #114