diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js
index e1165062b..8fe738518 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/route-get-bag-tiddler.js
@@ -40,7 +40,7 @@ exports.handler = function(request,response,state) {
 				}
 			});
 			tiddlerFields.revision = "0";
-			tiddlerFields.bag = "bag-gamma";
+			tiddlerFields.bag = bag_name;
 			tiddlerFields.type = tiddlerFields.type || "text/vnd.tiddlywiki";
 			state.sendResponse(200,{"Content-Type": "application/json"},JSON.stringify(tiddlerFields),"utf8");
 		} else {
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js b/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js
index 31c95d7e9..455f9f794 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/route-put-recipe-tiddler.js
@@ -39,11 +39,9 @@ exports.handler = function(request,response,state) {
 	});
 	// Require the recipe names to match
 	if(recipe_name === recipe_name_2) {
-		$tw.sqlTiddlerStore.saveRecipeTiddler(fields,recipe_name);
-		var recipe_bags = $tw.sqlTiddlerStore.getRecipeBags(recipe_name),
-			top_bag = recipe_bags[recipe_bags.length - 1];
+		var bag_name = $tw.sqlTiddlerStore.saveRecipeTiddler(fields,recipe_name);
 		response.writeHead(204, "OK",{
-			Etag: "\"" + top_bag + "/" + encodeURIComponent(title) + "/" + 2222 + ":\"",
+			Etag: "\"" + bag_name + "/" + encodeURIComponent(title) + "/" + 2222 + ":\"",
 			"Content-Type": "text/plain"
 		});
 		response.end();
diff --git a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js b/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js
index 475e9c6f6..78003a138 100644
--- a/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js
+++ b/plugins/tiddlywiki/multiwikiserver/modules/sql-tiddler-store.js
@@ -270,6 +270,7 @@ SqlTiddlerStore.prototype.saveRecipeTiddler = function(tiddlerFields,recipename)
 	});
 	// Save the tiddler to the topmost bag
 	this.saveBagTiddler(tiddlerFields,row.bag_name);
+	return row.bag_name;
 };
 
 SqlTiddlerStore.prototype.deleteTiddler = function(title,bagname) {