diff --git a/DBObj/SongData.cs b/DBObj/SongData.cs
index bb9bc94..5bab3cc 100644
--- a/DBObj/SongData.cs
+++ b/DBObj/SongData.cs
@@ -21,10 +21,13 @@ namespace DBObj
         {
             basic=new(songNumber,song,songSimplified,filename,humanVoice);
             A= new Artist(artistA, artistASimplified);
-            if(artistB!=null){
+            if(!artistB.Equals("")){
                 B = new Artist(artistB, artistBSimplified);
-            }  
-            isPublicSong = false;
+            } else
+            {
+                B = null;
+            }
+                isPublicSong = false;
         }
         public SongData(SongData value,PlayState s){
             basic = value.getBasic();
diff --git a/Room.cs b/Room.cs
index 9554393..0c62405 100644
--- a/Room.cs
+++ b/Room.cs
@@ -40,6 +40,7 @@ namespace DualScreenDemo
                 if (db.open(query, parameters) && db.found())
                 {
                     State = db.Field<string>("status");
+                    if (State.Equals("maintai")) { State = "active"; }
                     return State;
                 }
             }