Implement updating of query from multiword inputs