diff --git a/Artifact Tracker.esp b/Artifact Tracker.esp
index 0c747ce..9ac690e 100644
Binary files a/Artifact Tracker.esp and b/Artifact Tracker.esp differ
diff --git a/Scripts/ETR_TrackFoundItems.pex b/Scripts/ETR_TrackFoundItems.pex
index f272f6d..1bdc9b8 100644
Binary files a/Scripts/ETR_TrackFoundItems.pex and b/Scripts/ETR_TrackFoundItems.pex differ
diff --git a/Scripts/ETR_TrackStoredItems.pex b/Scripts/ETR_TrackStoredItems.pex
index 6736a8c..670550f 100644
Binary files a/Scripts/ETR_TrackStoredItems.pex and b/Scripts/ETR_TrackStoredItems.pex differ
diff --git a/Source/Scripts/ETR_TrackFoundItems.psc b/Source/Scripts/ETR_TrackFoundItems.psc
index 0a43371..7a031d6 100644
--- a/Source/Scripts/ETR_TrackFoundItems.psc
+++ b/Source/Scripts/ETR_TrackFoundItems.psc
@@ -8,7 +8,6 @@ FormList Property ETR_ItemsStored Auto
 FormList Property ETR_PersistentStorageList Auto
 
 Container Property ETR_CellStorageContainer Auto
-Container Property PlayerBookShelfContainer Auto
 
 Keyword Property LocTypePlayerHouse Auto
 
@@ -88,14 +87,9 @@ Event OnUpdate()
 		endif
 		bRescanHome = false
 
-		ObjectReference bookShelf
-		if lastDestContainer && lastDestContainer.GetBaseObject() == PlayerBookShelfContainer
-			bookShelf = lastDestContainer
-		endif
-
-		if bookShelf && bookShelf as PlayerBookShelfContainerScript
+		if lastDestContainer && lastDestContainer as PlayerBookShelfContainerScript
 			int iLimit = 10
-			while iLimit >= 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks"
+			while iLimit >= 0 && (lastDestContainer as PlayerBookShelfContainerScript).GetState() == "PlacingBooks"
 				Debug.Notification("Waiting for shelf update")
 				iLimit -= 1
 				Utility.wait(0.5)
diff --git a/Source/Scripts/ETR_TrackStoredItems.psc b/Source/Scripts/ETR_TrackStoredItems.psc
index 2f57c9c..261ffc7 100644
--- a/Source/Scripts/ETR_TrackStoredItems.psc
+++ b/Source/Scripts/ETR_TrackStoredItems.psc
@@ -8,7 +8,6 @@ FormList Property ETR_ItemsStored Auto
 FormList Property ETR_PersistentStorageList Auto
 
 Container Property ETR_CellStorageContainer Auto
-Container Property PlayerBookShelfContainer Auto
 
 Keyword Property LocTypePlayerHouse Auto
 
@@ -81,15 +80,19 @@ Event OnUpdate()
 		bRescanHome = false
 
 		ObjectReference bookShelf
-		if lastDestContainer && lastDestContainer.GetBaseObject() == PlayerBookShelfContainer
-			bookShelf = lastDestContainer
-		elseif lastSourceContainer && lastSourceContainer.GetBaseObject() == PlayerBookShelfContainer
-			bookShelf = lastSourceContainer
+		if lastDestContainer
+			if lastDestContainer as PlayerBookShelfContainerScript
+				bookShelf = lastDestContainer
+			endif
+		elseif lastSourceContainer
+			if lastSourceContainer as PlayerBookShelfContainerScript
+				bookShelf = lastSourceContainer
+			endif
 		endif
 
-		if bookShelf && bookShelf as PlayerBookShelfContainerScript
+		if bookShelf
 			int iLimit = 10
-			while iLimit >= 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks"
+			while iLimit > 0 && (bookShelf as PlayerBookShelfContainerScript).GetState() == "PlacingBooks"
 				Debug.Notification("Waiting for shelf update")
 				iLimit -= 1
 				Utility.wait(0.5)