diff --git a/src/server/settings/Info.go b/src/server/settings/Info.go
index ba27eb2..afd9280 100644
--- a/src/server/settings/Info.go
+++ b/src/server/settings/Info.go
@@ -12,6 +12,11 @@ func AddInfo(hash, info string) error {
 	if err != nil {
 		return err
 	}
+	
+	infoe := GetInfo(hash)
+	if infoe != "{}" {
+		return nil // already filled
+	}
 
 	hash = strings.ToUpper(hash)
 	return db.Update(func(tx *bolt.Tx) error {
diff --git a/src/server/web/helpers/M3u.go b/src/server/web/helpers/M3u.go
index 1510d5e..d345907 100644
--- a/src/server/web/helpers/M3u.go
+++ b/src/server/web/helpers/M3u.go
@@ -19,7 +19,8 @@ func MakeM3ULists(torrents []*settings.Torrent, host string) string {
 		magnet := t.Magnet
 		mag, _, err := GetMagnet(magnet)
 		if err == nil {
-			mag.Trackers = []string{} //Remove retrackers for small link size
+			mag.Trackers = []string{} // remove retrackers for small link size
+			mag.DisplayName = "" // clear dn from link - long query params may fail in QueryParam("link")
 			magnet = mag.String()
 		}
 		m3u += host + "/torrent/play?link=" + url.QueryEscape(magnet) + "&m3u=true\n"