diff --git a/ufw b/ufw
index f32294d..34c3036 100755
--- a/ufw
+++ b/ufw
@@ -84,7 +84,10 @@ get_max_filesize() {
 get_album_id() {
 	declare api_response api_status api_status_message
 
-	api_response=$( curl -f "$cfg_service_url/albumctl.json?m=new&name=$1&secret=$secret" )
+	api_response=$( curl --get \
+	                --data-urlencode "name=$1" \
+	                --data-urlencode "secret=$secret" \
+	                "$cfg_service_url/albumctl.json?m=new" )
 
 	get_api_status <<< "$api_response"
 
@@ -188,7 +191,10 @@ upload() {
 get_shortlink() {
 	declare url=$1 api_response api_status api_status_message
 
-	api_response=$( curl "$cfg_service_url/shrink.json?url=${url}&secret=$secret" )
+	api_response=$( curl --data-urlencode "url=$url" \
+	                     --data-urlencode "secret=$secret" \
+	                     "$cfg_service_url/shrink.json" )
+
 	get_api_status <<< "$api_response"
 
 	if (( api_status == 200 )); then
@@ -416,6 +422,8 @@ main() {
 		shift
 	done
 
+	echo "Args: ${args[@]}"
+
 	xclip_args+=( -selection "$xclip_selector" )
 
 	# Catch the args after --
@@ -444,7 +452,7 @@ main() {
 			get_token || return $?
 
 			for t in "${args[@]}"; do
-				get_shortlink "$1"
+				get_shortlink "$t"
 			done
 		;;