More tolerant multiple words queries

Previous version of query accepted just one whitespace. This corrects it and make it more tolerant.