More fixes to multiline case

In previous pull request, I've forgotten to case when there is only one query. 

Here is the fix.

Thanks!