Documentation fixes. See individual commits for more info

Fixed warning message issued when return_columns is specified for cer…

…tain general queries