Refactoring QueryWords
Refactoring QueryWords