Revert 'Use  instead of  to collect arguments.' because it breaks queries that end with -l or -a