Add single word query implementation & unit tests