@@ 17,8 17,8 @@ ensure_token() {
 send_request()
 {
 	url="$1"
-	post_data="$2"
-	method="$3"
+	method="$2"
+	post_data="$3"
 
 	echo $(curl -s -X "$method" -H "Authorization: Bearer $TOKEN" -H "Content-Type: application/json" -d "$post_data" "$url")
 }

          
@@ 29,19 29,28 @@ send_rest_get_request()
 	id="$2"
 	query_parameters="$3"
 
-	if [ -z "$id" ]
-	then
-		url="$api_prefix_url/$target"
-	else
-		url="$api_prefix_url/$target/$id"
-	fi
+	url="$api_prefix_url/$target/$id"
 
 	if [ ! -z "$query_parameters" ]
 	then
 		url="$url?$query_parameters"
 	fi
 
-	send_request "$url" "$post_data" "GET"
+	send_request "$url" "GET"
+}
+
+send_rest_index_request()
+{
+	target="$1"
+	query_parameters="$2"
+
+	url="$api_prefix_url/$target"
+	if [ ! -z "$query_parameters" ]
+	then
+		url="$url?$query_parameters"
+	fi
+
+	send_request "$url" "GET"
 }
 
 send_rest_post_request()

          
@@ 51,7 60,18 @@ send_rest_post_request()
 
 	url="$api_prefix_url/$target"
 
-	send_request "$url" "$post_data" "POST"
+	send_request "$url" "POST" "$post_data"
+}
+
+send_rest_put_request()
+{
+	target="$1"
+	id="$2"
+	put_data="$3"
+
+	url="$api_prefix_url/$target/$id"
+
+	send_request "$url" "PUT" "$put_data"
 }
 
 cmd_token_get_usage() {

          
@@ 83,7 103,7 @@ cmd_token_get() {
 	url="$api_prefix_url/login_check"
 	post_data="{\"username\": \"$username\", \"password\": \"$password\"}"
 
-	token=$(send_request "$url" "$post_data" "POST" | jq -r .token)
+	token=$(send_request "$url" "POST" "$post_data" | jq -r .token)
 	echo "export TOKEN=$token"
 }
 

          
@@ 127,13 147,12 @@ cmd_tag() {
 		*) cmd_tag_usage ;;
 	esac
 }
+
 cmd_tag_list() {
-
-	echo $(send_rest_get_request "tags") | jq .
+	echo $(send_rest_index_request "tags") | jq .
 }
 
 cmd_tag_find() {
-
 	search="$1"
 
 	if [ -z "$search" ]

          
@@ 142,7 161,7 @@ cmd_tag_find() {
 		exit 1
 	fi
 
-	echo $(send_rest_get_request "tags" "$id" "$search") | jq .
+	echo $(send_rest_index_request "tags" "$search") | jq .
 }
 
 cmd_tag_get() {

          
@@ 172,7 191,6 @@ cmd_tag_post() {
 }
 
 cmd_tag_put() {
-
 	id="$1"
 	label="$2"
 

          
@@ 182,13 200,9 @@ cmd_tag_put() {
 		exit 1
 	fi
 
-	url="$api_prefix_url/tags/$id"
-
-	post_data="{\"label\": \"$label\"}"
+	put_data="{\"label\": \"$label\"}"
 
-	response=$(send_request "$url" "$post_data" "PUT")
-
-	echo $response | jq .
+	echo $(send_rest_put_request "tags" "$id" "$put_data") | jq .
 }
 
 cmd_global_usage() {