Changed behavior of toQuery() to use + instead of %20