Fix query string without value issue