PLA-417 fixing word limit so it accept one word queries