Avoid warnings on spaces for query-all.
Avoid more warnings.