diff --git a/guix-data-service/model/package-derivation-by-guix-revision-range.scm b/guix-data-service/model/package-derivation-by-guix-revision-range.scm
index 585c2e3..15c2fa7 100644
--- a/guix-data-service/model/package-derivation-by-guix-revision-range.scm
+++ b/guix-data-service/model/package-derivation-by-guix-revision-range.scm
@@ -54,7 +54,7 @@ WHERE git_repository_id = $1 AND
     "
 INSERT INTO package_derivations_by_guix_revision_range
 SELECT DISTINCT
-       $1,
+       $2,
        packages.name AS package_name,
        packages.version AS package_version,
        revision_packages.derivation_id AS derivation_id,
@@ -101,7 +101,7 @@ ORDER BY packages.name, packages.version")
      conn
      (string-append
       "
-CREATE TABLE package_derivations_by_guix_revision_range_git_branch_"
+CREATE TABLE IF NOT EXISTS package_derivations_by_guix_revision_range_git_branch_"
       (number->string git-branch-id) "
 PARTITION OF package_derivations_by_guix_revision_range FOR VALUES IN ("
       (number->string git-branch-id)