diff --git a/upnpsoap.c b/upnpsoap.c
index 374a3ab..18f1e15 100644
--- a/upnpsoap.c
+++ b/upnpsoap.c
@@ -1800,13 +1800,16 @@ SamsungGetFeatureList(struct upnphttp * h, const char * action)
 		" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\""
 		" xsi:schemaLocation=\"urn:schemas-upnp-org:av:avs http://www.upnp.org/schemas/av/avs.xsd\">"
 		"<Feature name=\"samsung.com_BASICVIEW\" version=\"1\">"
-		 "<container id=\"1\" type=\"object.item.audioItem\"/>"
-		 "<container id=\"2\" type=\"object.item.videoItem\"/>"
-		 "<container id=\"3\" type=\"object.item.imageItem\"/>"
+		 "<container id=\"" MUSIC_ID "\" type=\"object.item.audioItem\"/>"
+		 "<container id=\"" VIDEO_ID "\" type=\"object.item.videoItem\"/>"
+		 "<container id=\"" IMAGE_ID "\" type=\"object.item.imageItem\"/>"
 		"</Feature>"
 		"</Features>"
 		"</FeatureList></u:X_GetFeatureListResponse>";
 
+	if (runtime_vars.root_container)
+		return SoapError(h, 401, "Invalid Action");
+
 	BuildSendAndCloseSoapResp(h, resp, sizeof(resp)-1);
 }