diff --git a/NEWS b/NEWS
index b989a65..6e5fdc3 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,10 @@
 0.36 (not yet released)
-* add command "tags"
+* add commands "tags", "playlistlength", "searchplaylist", "stickernames", "stickertypes", "stickernamestypes", "searchsticker"
+* complete command "sticker" API with "playlist" & "tags" entities subcommands (get/set/delete/list/find/inc/dec)
+* fix a bug in "sticker" API "delete" subcommand where "name" parameter is mandatory
+* update documentation
 * concatenate multiple tag values
+* require libmpdclient 2.23 or newer
 
 0.35 (2023/12/21)
 * fix null pointer dereference on bad status format
@@ -9,7 +13,7 @@
 * add commands "lsdirs", "addplaylist", "delplaylist", "moveplaylist", "renplaylist", "clearplaylist"
 * add "playlist" option "--with-prio"
 * bash completion: pass "--" to mpc to allow parameters with dash
-* bash completion: fix filenames with paranetheses
+* bash completion: fix filenames with parentheses
 * bash completion: override $MPC_FORMAT
 
 0.34 (2021/11/30)
diff --git a/doc/index.rst b/doc/index.rst
index 729a367..a0495e4 100644
--- a/doc/index.rst
+++ b/doc/index.rst
@@ -252,19 +252,19 @@ Playlist Commands
 
 :command:`save <file>` - Saves playlist as <file>.
 
-:command:`addplaylist <playlist> <file>` - Adds a song from the music database to the
-   playlist. The playlist will be created if it does not exist.
-   Can also read input from pipes.
+:command:`addplaylist <playlist> <file>` - Adds a song from the music database to the playlist. The playlist will be created if it does not exist. Can also read input from pipes.
 
-:command:`delplaylist <playlist> <songpos>` - Removes the song at given position from the playlist. Can
-   also read input from pipes.
+:command:`delplaylist <playlist> <songpos>` - Removes the song at given position from the playlist. Can also read input from pipes.
 
-:command:`moveplaylist <playlist> <from> <to>` - Moves the song at given <from> position 
-   to the <to> position in the playlist.
+:command:`moveplaylist <playlist> <from> <to>` - Moves the song at given <from> position to the <to> position in the playlist.
 
-:command:`renplaylist <playlist> <new playlist>` - Rename a playlist.
+:command:`renplaylist <playlist> <new playlist>` - Rename the playlist.
 
-:command:`clearplaylist <playlist>` - Clear the playlist name (i.e. truncate playlist.m3u).
+:command:`clearplaylist <playlist>` - Clear the playlist.
+
+:command:`searchplaylist <playlist> <expression>` - Search the playlist for songs matching the expression.
+
+:command:`playlistlength <playlist>` - Show the number of songs and their total playtime (in seconds) in the playlist.
 
 Database Commands
 ^^^^^^^^^^^^^^^^^
@@ -363,23 +363,90 @@ Mount Commands
 Sticker Commands
 ^^^^^^^^^^^^^^^^^
 
-The :command:`sticker` command allows you to get and set song
-stickers.
+The :command:`sticker` command allows you to get and set stickers on "songs", "playlists" and several MPD "tags".
+
+1. "song" API
 
-:command:`sticker <file> set <key> <value>` - Set the value of a song
-   sticker.
+:command:`sticker <file> set <name> <value>` - Set the value of a song sticker.
 
-:command:`sticker <file> get <key>` - Print the value of a song
-   sticker.
+:command:`sticker <file> get <name>` - Print the value of a song sticker.
 
 :command:`sticker <file> list` - List all stickers of a song.
 
-:command:`sticker <file> delete <key>` - Delete a song sticker.
+:command:`sticker <file> delete <name>` - Delete a song sticker.
+
+:command:`sticker <file> inc <name> <value>` - Increment the sticker of the song by the given value.
+
+:command:`sticker <file> dec <name> <value>` - Decrement the sticker of the song by the given value.
+
+:command:`sticker <dir> find <name>` - Search for stickers with the specified name, below the given directory.
+   Search for any values of the ``rated`` stickers under the ``Wolfgang Amadeus Mozart`` MPD folder::
+
+      mpc sticker "Wolfgang Amadeus Mozart" find rated
+
+   Search for any values of the ``rated`` stickers under any MPD folders::
+
+      mpc sticker "" find rated
+
+
+2. "playlist" API
+
+:command:`sticker <playlist> playlist-set <name> <value>` - Set the value of a playlist sticker.
+
+:command:`sticker <playlist> playlist-get <name>` - Print the value of a playlist sticker.
+
+:command:`sticker <playlist> playlist-list` - List all stickers of a playlist.
+
+:command:`sticker <playlist> playlist-delete <name>` - Delete a playlist sticker.
+
+:command:`sticker <playlist> playlist-inc <name> <value>` - Increment the sticker of the playlist by the given value.
+
+   Increments the ``played`` sticker of the ``Christmas Playlist`` playlist by ``1``::
+
+      mpc sticker "Christmas Playlist" playlist-inc played 1
+
+:command:`sticker <playlist> playlist-dec <name> <value>` - Decrement the sticker of the playlist by the given value.
+
+:command:`sticker <dir> playlist-find <name>` - Search for stickers with the specified name, below the given directory.
+
+3. "tags" API
+
+:command:`sticker <uri> tag-set <tag> <name> <value>` - Set the value of a playlist sticker.
+
+:command:`sticker <uri> tag-get <tag> <name>` - Print the value of a tag sticker.
+
+:command:`sticker <uri> tag-list <tag>` - List all stickers of a tag.
+
+:command:`sticker <uri> tag-delete <tag> <name>` - Delete a tag sticker.
+
+:command:`sticker <uri> tag-inc <tag> <name> <value>` - Increment the sticker of the tag by the given value.
+
+   Increments the ``played`` sticker of the ``Kraftwerk`` artist by 1::
+
+      mpc sticker "Kraftwerk" tag-inc Artist played 1
+
+:command:`sticker <uri> tag-dec <tag> <name> <value>` - Decrement the sticker of the tag by the given value.
+
+:command:`sticker <dir> tag-find <tag> <name>` - Search for stickers of the tag with the specified name, below the specified directory.
+
+4. Misc commands
+
+:command:`stickernames` - Display the list of unique sticker names.
+
+:command:`stickertypes` - Display the list of available sticker types.
+
+:command:`stickernamestypes <type>` - Display the list of unique sticker names for this sticker type.
+
+:command:`searchsticker <type> <uri> <name> <oper> <value>` - Search for MPD <type> entities @<uri> having stickers matching the expression "<name> <oper> <value>".
+   Valid <oper> are ``=``, ``>``, ``<``, ``eq``, ``gt``, ``lt``, ``contains``, ``starts_with``
+
+   Search for any songs in the ``Wolfgang Amadeus Mozart`` MPD folder having sticker ``rated`` equals to ``Good``::
 
-:command:`sticker <dir> find <key>` - Search for stickers with the
-   specified name, below the specified directory.
+      mpc searchsticker song "Wolfgang Amadeus Mozart" rated = Good
 
+   Search for any playlist having sticker ``played`` greater than 100::
 
+      mpc searchsticker playlist "" played gt 100
 
 Output Commands
 ^^^^^^^^^^^^^^^
diff --git a/src/command.c b/src/command.c
index 7fdfe95..72c4db0 100644
--- a/src/command.c
+++ b/src/command.c
@@ -843,6 +843,33 @@ cmd_clearplaylist(int argc, char **argv, struct mpd_connection *conn)
 	return 0;
 }
 
+int
+cmd_playlistlength(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	const char* playlist = argv[0];
+
+	if (!mpd_send_playlistlength(conn, playlist))
+		return -1;
+
+	struct mpd_pair* pair = mpd_recv_pair_named(conn, "songs");
+	if (pair != NULL) {
+		printf("songs: %s\n", pair->value);
+		mpd_return_pair(conn, pair);
+	}
+
+	pair = mpd_recv_pair_named(conn, "playtime");
+	if (pair != NULL) {
+		printf("playtime: %s\n", pair->value);
+		mpd_return_pair(conn, pair);
+	}
+
+	if (!mpd_response_finish(conn))
+		return -1;
+
+	return 0;
+}
+
 int
 cmd_load(int argc, char **argv, struct mpd_connection *conn)
 {
diff --git a/src/command.h b/src/command.h
index 6592d39..a209ac6 100644
--- a/src/command.h
+++ b/src/command.h
@@ -50,23 +50,12 @@ int cmd_toggle(int argc, char **argv, struct mpd_connection *conn);
 int cmd_partitionlist(int argc, char **argv, struct mpd_connection *conn);
 int cmd_partitionmake(int argc, char **argv, struct mpd_connection *conn);
 int cmd_partitiondelete(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_replaygain(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_channels(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_sendmessage(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_waitmessage(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_subscribe(int argc, char **argv, struct mpd_connection *conn);
-
-int
-cmd_tags(int argc, char **argv, struct mpd_connection *conn);
+int cmd_replaygain(int argc, char **argv, struct mpd_connection *conn);
+int cmd_channels(int argc, char **argv, struct mpd_connection *conn);
+int cmd_sendmessage(int argc, char **argv, struct mpd_connection *conn);
+int cmd_waitmessage(int argc, char **argv, struct mpd_connection *conn);
+int cmd_subscribe(int argc, char **argv, struct mpd_connection *conn);
+int cmd_tags(int argc, char **argv, struct mpd_connection *conn);
+int cmd_playlistlength(int argc, char **argv, struct mpd_connection *conn);
 
 #endif /* COMMAND_H */
diff --git a/src/main.c b/src/main.c
index be0543b..382e7c2 100644
--- a/src/main.c
+++ b/src/main.c
@@ -47,7 +47,7 @@ static const struct command {
 	/** NULL means they won't be shown in help */
 	const char *help;
 } mpc_table [] = {
-	/* command,     min, max, pipe, handler,         usage, help */
+	/* command,          min, max, pipe, handler,         usage, help */
 	{"add",              0, -1, 1, cmd_add,              "<uri>", "Add a song to the queue"},
 	{"addplaylist",      2, -1, 3, cmd_addplaylist,      "<file> <uri> ...", "Add a song to the playlist"},
 	{"albumart",         1,  1, 0, cmd_albumart,         "<uri>", "Download album art for the given song and write to stdout." },
@@ -95,6 +95,7 @@ static const struct command {
 	{"pause-if-playing", 0,  0, 0, cmd_pause_if_playing, "", "Pauses the currently playing song; exits with failure if not playing"},
 	{"play",             0,  1, 2, cmd_play,             "[<position>]", "Start playing at <position>"},
 	{"playlist",         0,  1, 0, cmd_playlist,         "[<playlist>]", "Print <playlist>"},
+	{"playlistlength",   1,  1, 0, cmd_playlistlength,   "<file>", "Show the number of songs and their total playtime (seconds) in the playlist"},
 	{"prev",             0,  0, 0, cmd_prev,             "", "Play the previous song in the queue"},
 	{"prio",             2, -1, 2, cmd_prio,             "<prio> <position/range> ...", "Change song priorities in the queue"},
 	{"queued",	         0,  0, 0, cmd_queued,           "", "Show the next queued song"},
@@ -109,6 +110,7 @@ static const struct command {
 	{"search",           1, -1, 0, cmd_search,           "<type> <query>", "Search for a song"},
 	{"searchadd",        1, -1, 0, cmd_searchadd,        "<type> <query>", "Search songs and add them to the queue"},
 	{"searchplay",       1, -1, 0, cmd_searchplay,       "<pattern>", "Find and play a song in the queue"},
+	{"searchplaylist",   2,  2, 0, cmd_searchplaylist,   "<file> <expression>", "Search the playlist for songs matching the expression"},
 	{"seek",             1,  1, 0, cmd_seek,             "[+-][HH:MM:SS]|<0-100>%", "Seeks to the specified position"},
 	{"seekthrough",      1,  1, 0, cmd_seek_through,      "[+-][HH:MM:SS]", "Seeks by an amount of time within the song and playlist"},
 	{"sendmessage",      2,  2, 0, cmd_sendmessage,      "<channel> <message>", "Send a message to the specified channel." },
@@ -116,7 +118,11 @@ static const struct command {
 	{"single",           0,  1, 0, cmd_single,           "<on|once|off>", "Toggle single mode, or specify state"},
 	{"stats",            0, -1, 0, cmd_stats,            "", "Display statistics about MPD"},
 	{"status",           0, -1, 0, cmd_status,           "", NULL}, /* status was added for pedantic reasons */
-	{"sticker",          2, -1, 0, cmd_sticker,          "<uri> <get|set|list|delete|find> [args..]", "Sticker management"},
+	{"sticker",          2, -1, 0, cmd_sticker,          "<uri> <get[-playlist|-tag]|set[-playlist|-tag]|list[-playlist|-tag]|delete[-playlist|-tag]|find[-playlist|-tag]|inc[-playlist|-tag]|dec[-playlist|-tag]> [args..]", "Sticker management"},
+	{"stickernames",     0,  0, 0, cmd_stickernames,     "", "Display the list of unique sticker names"},
+	{"stickertypes",     0,  0, 0, cmd_stickertypes,     "", "Display the list of available sticker types"},
+	{"stickernamestypes",1,  1, 0, cmd_stickernamestypes,"<type>", "Display the list of unique sticker names for this sticker type"},
+	{"searchsticker",    5,  5, 0, cmd_searchsticker,    "<type> <uri> <name> <oper> <value>", "Search for MPD <type> entities having sticker <name> <oper> to <value> set at <uri>"},
 	{"stop",             0,  0, 0, cmd_stop,             "", "Stop playback"},
 	{"subscribe",        1,  1, 0, cmd_subscribe,        "<channel>", "Subscribe to the specified channel and continuously receive messages." },
 	{"tab",              1,  1, 0, cmd_tab,              "<path>", NULL},
diff --git a/src/search.c b/src/search.c
index 9821f94..1738e48 100644
--- a/src/search.c
+++ b/src/search.c
@@ -170,7 +170,6 @@ cmd_search(int argc, char **argv, struct mpd_connection *conn)
 	return do_search(argc, argv, conn, false);
 }
 
-
 int
 cmd_searchadd(int argc, char **argv, struct mpd_connection *conn)
 {
@@ -188,3 +187,31 @@ cmd_findadd(int argc, char **argv, struct mpd_connection *conn)
 {
 	return do_searchadd(argc, argv, conn, true);
 }
+
+int
+cmd_searchplaylist(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	const char* playlist = argv[0];
+	const char* expression = argv[1];
+
+	/* ask MPD to omit the tags which are not used by the
+		`--format` to reduce network transfer for tag values we're
+		not going to use anyway */
+	if (!mpd_command_list_begin(conn, false) ||
+		!send_tag_types_for_format(conn, options.custom_format ? options.format : NULL))
+		printErrorAndExit(conn);
+
+	mpd_playlist_search_begin(conn, playlist, expression);
+
+	if (!mpd_playlist_search_commit(conn))
+		printErrorAndExit(conn);
+
+	if (!mpd_command_list_end(conn))
+		printErrorAndExit(conn);
+
+	print_entity_list(conn, MPD_ENTITY_TYPE_SONG, options.custom_format);
+
+	my_finishCommand(conn);
+	return 0;
+}
diff --git a/src/search.h b/src/search.h
index 2bf6ef4..96551f5 100644
--- a/src/search.h
+++ b/src/search.h
@@ -23,4 +23,7 @@ cmd_find(int argc, char **argv, struct mpd_connection *conn);
 int
 cmd_findadd(int argc, char **argv, struct mpd_connection *conn);
 
+int
+cmd_searchplaylist(int argc, char **argv, struct mpd_connection *conn);
+
 #endif
diff --git a/src/sticker.c b/src/sticker.c
index 94fb931..d1a957f 100644
--- a/src/sticker.c
+++ b/src/sticker.c
@@ -20,6 +20,7 @@ recv_print_stickers(struct mpd_connection *connection)
 	}
 }
 
+/*
 static void
 recv_print_stickers2(struct mpd_connection *connection)
 {
@@ -42,69 +43,337 @@ recv_print_stickers2(struct mpd_connection *connection)
 	if (!first)
 		putchar('\n');
 }
+*/
+
+static void
+recv_print_stickers3(struct mpd_connection *connection) {
+
+	struct mpd_pair *pair;
+	while ((pair = mpd_recv_pair(connection)) != NULL) {
+
+		if (strcmp(pair->name, "sticker")) {
+			printf("%s: ", pair->value);
+		}
+		else {
+			printf("%s\n", pair->value);
+		}
+		mpd_return_pair(connection, pair);
+	}
+}
 
 int
 cmd_sticker(int argc, char **argv, struct mpd_connection *conn)
 {
-	if(!strcmp(argv[1], "set"))
-	{
-		if(argc < 4)
-		{
-			fputs("syntax: sticker <uri> set <key> <value>\n", stderr);
+	const char* uri = argv[0];
+	const char* command = argv[1];
+	//printf("argc = %d, command = %s, uri = %s\n", argc, command, uri);
+
+	// "song" entity
+	if (!strcmp(command, "set")) {
+		
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> set <name> <value>\n", stderr);
 			return 0;
 		}
+		mpd_send_sticker_set(conn, "song", uri, argv[2], argv[3]);
+	}
+	else if (!strcmp(command, "get")) {
 
-		mpd_send_sticker_set(conn, "song", argv[0], argv[2], argv[3]);
-		my_finishCommand(conn);
-		return 0;
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> get <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_get(conn, "song", uri, argv[2]);
+		recv_print_stickers(conn);
+	}
+	else if (!strcmp(command, "find")) {
+
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> find <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_find(conn, "song", uri, argv[2]);
+		recv_print_stickers3(conn);
+	}
+	else if (!strcmp(command, "delete")) {
+
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> delete <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_delete(conn, "song", uri, argv[2]);
+	}
+	else if (!strcmp(command, "list")) {
+
+		if (argc < 2) {
+			fputs("syntax: sticker <uri> list\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_list(conn, "song", uri);
+		recv_print_stickers(conn);
+	}
+	else if (!strcmp(command, "inc")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> inc <name> <value>\n", stderr);
+			return 0;
+		}
+		unsigned value;
+		sscanf(argv[3], "%u", &value);
+		mpd_send_sticker_inc(conn, "song", uri, argv[2], value);
 	}
-	else if(!strcmp(argv[1], "get"))
-	{
-		if(argc < 3)
-		{
-			fputs("syntax: sticker <uri> get <key>\n", stderr);
+	else if (!strcmp(command, "dec")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> dec <name> <value>\n", stderr);
 			return 0;
 		}
+		unsigned value;
+		sscanf(argv[3], "%u", &value);
+		mpd_send_sticker_dec(conn, "song", uri, argv[2], value);
+	}
+	// "playlist" entity
+	else if (!strcmp(command, "playlist-set")) {
+		
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> playlist-set <name> <value>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_set(conn, "playlist", uri, argv[2], argv[3]);
+	}
+	else if (!strcmp(command, "playlist-get")) {
 
-		mpd_send_sticker_get(conn, "song", argv[0], argv[2]);
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> playlist-get <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_get(conn, "playlist", uri, argv[2]);
 		recv_print_stickers(conn);
-		my_finishCommand(conn);
 	}
-	else if(!strcmp(argv[1], "find"))
-	{
-		if(argc < 3)
-		{
-			fputs("syntax: sticker <dir> find <key>\n", stderr);
+	else if (!strcmp(command, "playlist-find")) {
+
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> playlist-find <name>\n", stderr);
 			return 0;
 		}
+		mpd_send_sticker_find(conn, "playlist", uri, argv[2]);
+		recv_print_stickers3(conn);
+	}
+	else if (!strcmp(command, "playlist-delete")) {
 
-		mpd_send_sticker_find(conn, "song", argv[0], argv[2]);
-		recv_print_stickers2(conn);
-		my_finishCommand(conn);
-	} else if (strcmp(argv[1], "delete") == 0) {
-		if(argc < 2)
-		{
-			fputs("syntax: sticker <uri> delete [key]\n", stderr);
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> playlist-delete <name>\n", stderr);
 			return 0;
 		}
+		mpd_send_sticker_delete(conn, "playlist", uri, argv[2]);
+	}
+	else if (!strcmp(command, "playlist-list")) {
 
-		mpd_send_sticker_delete(conn, "song", argv[0], argc > 2 ? argv[2] : NULL);
-		my_finishCommand(conn);
+		if (argc < 2) {
+			fputs("syntax: sticker <uri> playlist-list\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_list(conn, "playlist", uri);
+		recv_print_stickers(conn);
 	}
-	else if(!strcmp(argv[1], "list"))
-	{
-		if(argc < 2)
-		{
-			fputs("syntax: sticker <uri> list\n", stderr);
+	else if (!strcmp(command, "playlist-inc")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> playlist-inc <name> <value>\n", stderr);
+			return 0;
+		}
+		unsigned value;
+		sscanf(argv[3], "%u", &value);
+		mpd_send_sticker_inc(conn, "playlist", uri, argv[2], value);
+	}
+	else if (!strcmp(command, "playlist-dec")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> playlist-dec <name> <value>\n", stderr);
+			return 0;
+		}
+		unsigned value;
+		sscanf(argv[3], "%u", &value);
+		mpd_send_sticker_dec(conn, "playlist", uri, argv[2], value);
+	}
+	// MPD "tag" entity
+	else if (!strcmp(command, "tag-set")) {
+		
+		if (argc < 5) {
+			fputs("syntax: sticker <uri> tag-set <tag> <name> <value>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_set(conn, argv[2], uri, argv[3], argv[4]);
+	}
+	else if (!strcmp(command, "tag-get")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> tag-get <tag> <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_get(conn, argv[2], uri, argv[3]);
+		recv_print_stickers(conn);
+	}
+	else if (!strcmp(command, "tag-find")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> tag-find <tag> <name>\n", stderr);
 			return 0;
 		}
+		mpd_send_sticker_find(conn, argv[2], uri, argv[3]);
+		recv_print_stickers3(conn);
+	}
+	else if (!strcmp(command, "tag-delete")) {
+
+		if (argc < 4) {
+			fputs("syntax: sticker <uri> tag-delete <tag> <name>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_delete(conn, argv[2], uri, argv[3]);
+	}
+	else if (!strcmp(command, "tag-list")) {
 
-		mpd_send_sticker_list(conn, "song", argv[0]);
+		if (argc < 3) {
+			fputs("syntax: sticker <uri> tag-list <tag>\n", stderr);
+			return 0;
+		}
+		mpd_send_sticker_list(conn, argv[2], uri);
 		recv_print_stickers(conn);
-		my_finishCommand(conn);
 	}
-	else
-		fputs("error: unknown command.\n", stderr);
+	else if (!strcmp(command, "tag-inc")) {
+
+		if (argc < 5) {
+			fputs("syntax: sticker <uri> tag-inc <tag> <name> <value>\n", stderr);
+			return 0;
+		}
+		unsigned value;
+		sscanf(argv[4], "%u", &value);
+		mpd_send_sticker_inc(conn, argv[2], uri, argv[3], value);
+	}
+	else if (!strcmp(command, "tag-dec")) {
+
+		if (argc < 5) {
+			fputs("syntax: sticker <uri> tag-dec <tag> <name> <value>\n", stderr);
+			return 0;
+		}
+		unsigned value;
+		sscanf(argv[4], "%u", &value);
+		mpd_send_sticker_dec(conn, argv[2], uri, argv[3], value);
+	}
+	else {
+		fprintf(stderr, "error: unknown command '%s'.\n", command);
+		return 0;
+	}
+
+	my_finishCommand(conn);
+	return 0;
+}
+
+int
+cmd_stickernames(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	(void)argv; // silence warning about unused argument
+	struct mpd_pair *pair;
+
+	mpd_send_stickernames(conn);
+
+	while ((pair = mpd_recv_pair(conn)) != NULL) {
+
+		if (!strcmp(pair->name, "name")) {
+			printf("%s\n", pair->value);
+		}
+		mpd_return_pair(conn, pair);
+	}
+
+	my_finishCommand(conn);
+	return 0;
+}
+
+int
+cmd_stickertypes(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	(void)argv; // silence warning about unused argument
+	struct mpd_pair *pair;
+
+	mpd_send_stickertypes(conn);
+
+	while ((pair = mpd_recv_pair(conn)) != NULL) {
+
+		if (!strcmp(pair->name, "stickertype")) {
+			printf("%s\n", pair->value);
+		}
+		mpd_return_pair(conn, pair);
+	}
+
+	my_finishCommand(conn);
+	return 0;
+}
+
+int
+cmd_stickernamestypes(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	const char* type = argv[0];
+	struct mpd_pair *pair;
+
+	mpd_send_stickernamestypes(conn, type);
+
+	while ((pair = mpd_recv_pair(conn)) != NULL) {
+
+		if (!strcmp(pair->name, "name")) {
+			printf("%s\n", pair->value);
+		}
+		mpd_return_pair(conn, pair);
+	}
+
+	my_finishCommand(conn);
+	return 0;
+}
+
+int
+cmd_searchsticker(int argc, char **argv, struct mpd_connection *conn)
+{
+	(void)argc; // silence warning about unused argument
+	const char* type = argv[0];
+	const char* base_uri = argv[1];
+	const char* name = argv[2];
+	const char* oper = argv[3];
+	const char* value = argv[4];
+
+	enum mpd_sticker_operator sticker_op;
+
+	// reverse get_sticker_oper_str() !
+	if (!strcmp(oper, "="))
+		sticker_op = MPD_STICKER_OP_EQ;
+	else if (!strcmp(oper, ">"))
+		sticker_op = MPD_STICKER_OP_GT;
+	else if (!strcmp(oper, "<"))
+		sticker_op = MPD_STICKER_OP_LT;
+	else if (!strcmp(oper, "eq"))
+		sticker_op = MPD_STICKER_OP_EQ_INT;
+	else if (!strcmp(oper, "gt"))
+		sticker_op = MPD_STICKER_OP_GT_INT;
+	else if (!strcmp(oper, "lt"))
+		sticker_op = MPD_STICKER_OP_LT_INT;
+	else if (!strcmp(oper, "contains"))
+		sticker_op = MPD_STICKER_OP_CONTAINS;
+	else if (!strcmp(oper, "starts_with"))
+		sticker_op = MPD_STICKER_OP_STARTS_WITH;
+	else {
+		fprintf(stderr, "error: unknown operator %s.\n", oper);
+		return 0;
+	}
+
+	mpd_sticker_search_begin(conn, type, base_uri, name);
+
+	mpd_sticker_search_add_value_constraint(conn, sticker_op, value);
+
+	if (!mpd_sticker_search_commit(conn))
+		printErrorAndExit(conn);
 
+	recv_print_stickers3(conn);
+	my_finishCommand(conn);
 	return 0;
 }
diff --git a/src/sticker.h b/src/sticker.h
index bec9161..996ee04 100644
--- a/src/sticker.h
+++ b/src/sticker.h
@@ -9,4 +9,16 @@ struct mpd_connection;
 int
 cmd_sticker(int argc, char **argv, struct mpd_connection *conn);
 
+int
+cmd_stickernames(int argc, char **argv, struct mpd_connection *conn);
+
+int
+cmd_stickertypes(int argc, char **argv, struct mpd_connection *conn);
+
+int
+cmd_stickernamestypes(int argc, char **argv, struct mpd_connection *conn);
+
+int
+cmd_searchsticker(int argc, char **argv, struct mpd_connection *conn);
+
 #endif
diff --git a/subprojects/libmpdclient.wrap b/subprojects/libmpdclient.wrap
index 002c003..f13aff5 100644
--- a/subprojects/libmpdclient.wrap
+++ b/subprojects/libmpdclient.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/MusicPlayerDaemon/libmpdclient
-revision = v2.21
+revision = v2.23
 
 [provide]
 libmpdclient = libmpdclient_dep