diff --git a/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.php b/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.php
index 9b2f86c..da1d03c 100644
--- a/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.php
+++ b/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.php
@@ -68,7 +68,7 @@ final class Chapter extends Watcher
 		$this->verses = $verses;
 
 		// set the table
-		$this->table = 'book';
+		$this->table = 'chapter';
 	}
 
 	/**
@@ -227,7 +227,7 @@ final class Chapter extends Watcher
 			foreach ($api->verses as $verse)
 			{
 				// check if the verse exist
-				$match['value'] = (int) $verse->verse;
+				$match['value'] = (string) $verse->verse;
 				if (($object = $this->getTarget($match, $verses)) !== null)
 				{
 					$verse->id = $object->id;
diff --git a/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.power b/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.power
index fd50416..55a46f4 100644
--- a/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.power
+++ b/src/07d3888a-5f35-4ba7-977f-fb2f5cf99061/code.power
@@ -39,7 +39,7 @@
 		$this->verses = $verses;
 
 		// set the table
-		$this->table = 'book';
+		$this->table = 'chapter';
 	}
 
 	/**
@@ -198,7 +198,7 @@
 			foreach ($api->verses as $verse)
 			{
 				// check if the verse exist
-				$match['value'] = (int) $verse->verse;
+				$match['value'] = (string) $verse->verse;
 				if (($object = $this->getTarget($match, $verses)) !== null)
 				{
 					$verse->id = $object->id;
diff --git a/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.php b/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.php
index 4702193..eb9277c 100644
--- a/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.php
+++ b/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.php
@@ -167,7 +167,7 @@ abstract class Watcher
 		{
 			if ($_value->{$match['key']} === $match['value'])
 			{
-				return $value;
+				return $_value;
 			}
 		}
 
diff --git a/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.power b/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.power
index 7a09769..5f7977a 100644
--- a/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.power
+++ b/src/37e36c41-16a7-4c5d-972c-99acad5fd0b1/code.power
@@ -140,7 +140,7 @@
 		{
 			if ($_value->{$match['key']} === $match['value'])
 			{
-				return $value;
+				return $_value;
 			}
 		}
 
diff --git a/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.php b/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.php
index e78d8ec..1f34b90 100644
--- a/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.php
+++ b/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.php
@@ -160,7 +160,7 @@ final class Book extends Watcher
 		foreach ($books as $book)
 		{
 			// check if the verse exist
-			$match['value'] = (int) $book->nr;
+			$match['value'] = (string) $book->nr;
 			if (($object = $this->getTarget($match, $local_books)) !== null)
 			{
 				$book->id = $object->id;
diff --git a/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.power b/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.power
index d351d0c..0179369 100644
--- a/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.power
+++ b/src/c2a8a5fa-8e7f-443a-86d7-a8c1e4cdfa98/code.power
@@ -132,7 +132,7 @@
 		foreach ($books as $book)
 		{
 			// check if the verse exist
-			$match['value'] = (int) $book->nr;
+			$match['value'] = (string) $book->nr;
 			if (($object = $this->getTarget($match, $local_books)) !== null)
 			{
 				$book->id = $object->id;