bug fixed query for more words