Added code to do multiword queries