Fix #133, #134: Don't add not substituted arguments and empty values to query string

Fix #133, #134: Don't add not substituted arguments and empty values to query string #568