diff --git a/cmd/swarm/main.go b/cmd/swarm/main.go
index 04930760ee..c4227d16ba 100644
--- a/cmd/swarm/main.go
+++ b/cmd/swarm/main.go
@@ -252,6 +252,10 @@ func registerBzzService(ctx *cli.Context, stack *node.Node) {
 	if len(bzzport) > 0 {
 		bzzconfig.Port = bzzport
 	}
+	networkId := ctx.GlobalUint64(SwarmNetworkIdFlag.Name)
+	if networkId > 0 {
+		bzzconfig.NetworkId = networkId
+	}
 	swapEnabled := ctx.GlobalBool(SwarmSwapEnabled.Name)
 	syncEnabled := ctx.GlobalBoolT(SwarmSyncEnabled.Name)
 
diff --git a/swarm/api/manifest.go b/swarm/api/manifest.go
index d6dc24c486..1d8df0d0b8 100644
--- a/swarm/api/manifest.go
+++ b/swarm/api/manifest.go
@@ -333,7 +333,7 @@ func RegularSlashes(path string) (res string) {
 }
 
 func (self *manifestTrie) getEntry(spath string) (entry *manifestTrieEntry, fullpath string) {
-	path := RegularSlashes(spath)
+	path := RegularSlashes(spath) + "/"
 	var pos int
 	quitC := make(chan bool)
 	entry, pos = self.findPrefixOf(path, quitC)