diff --git a/toys/createindex b/toys/createindex
index b69d8c6..3f9a3d5 100755
--- a/toys/createindex
+++ b/toys/createindex
@@ -73,6 +73,7 @@ do
 		'-M')	show+=(types)		;;
 		'-N')	show+=(tracktotals)	;;
 		'-p')	show+=(performers)	;;
+		'-r')	show+=(releasecountries)	;;
 		'-s')	show+=(rates)		;;
 		'-S')	show+=(size)
 			length[count]=5		;;
@@ -121,6 +122,7 @@ done
 	    -d Disc
 	    -g Genre
 	    -p Performer
+	    -r Release Country
 	    -N Track total
 	    -t Title
 	    -y Year
@@ -280,8 +282,8 @@ fi
 
 cat <<-EOBrag
 	# Generated by AtOM's createindex toy.
-	# https://gitorious.org/atom
-	# (C) 2012-2013 Vincent Riquer (GPL-3)
+	# https://framagit.org/atom/AtOM/
+	# (C) 2012-2025 Vincent Riquer (GPL-3)
 	# 
 	# $0 $args
 	#
@@ -312,6 +314,7 @@ do
 		oldtimestamp)	info='Last modified'	;;
 		types)		info='Format'		;;
 		performers)	info='Performer'	;;
+		releasecountries)	info='Country'		;;
 		rates)		info='Sample rate'	;;
 		titles)		info='Title'		;;
 		tracktotals)	info='Track total'	;;
@@ -345,6 +348,7 @@ SELECT
 	tags.disc,
 	tags.genre,
 	tags.performer,
+	tags.releasecountry,
 	tags.title,
 	tags.track,
 	tags.year,
@@ -403,6 +407,8 @@ do
 	rest="${rest#*::AtOM:SQL:Sep::}"
 	performer="${rest%%::AtOM:SQL:Sep::*}"
 	rest="${rest#*::AtOM:SQL:Sep::}"
+	releasecountry="${rest%%::AtOM:SQL:Sep::*}"
+	rest="${rest#*::AtOM:SQL:Sep::}"
 	title="${rest%%::AtOM:SQL:Sep::*}"
 	rest="${rest#*::AtOM:SQL:Sep::}"
 	track="${rest%%::AtOM:SQL:Sep::*}"
@@ -530,6 +536,13 @@ do
 			[ -n "$performer" ]	\
 			&& performers+="${performers+,}$performer"
 		fi
+		if ! [[ $releasecountries =~ $expr1"$releasecountry"$expr2 ]]
+		then
+			[ -z "$releasecountries" ]	\
+				&& unset releasecountries
+			[ -n "$releasecountry" ]	\
+			&& releasecountries+="${releasecountries+,}$releasecountry"
+		fi
 		if ! [[ $titles =~ $expr1"$title"$expr2 ]]
 		then
 			[ -z "$titles" ]	\
@@ -556,10 +569,10 @@ do
 		then
 			printline
 		fi
-		unset bitrates
+		unset bitrates depths rates
 		channelss="$channels"
-		rates="$rate"
-		depths="$depth"
+		(( rate )) && rates="$rate"
+		(( depth )) && depths="$depth"
 		types="$type"
 		albumartists="$albumartist"
 		albums="$album"
@@ -568,6 +581,7 @@ do
 		discs="$disc"
 		genres="$genre"
 		performers="$performer"
+		releasecountries="$releasecountry"
 		titles="$title"
 		tracktotals="$tracktotal"
 		years="$year"