diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
index 00d9063e3c1dd5501a5d64cd1c84fba1e164e970..8e9cf7e289f4063e69fdbd7cf94dac9d7ef76129 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/ExtensionRepository.php
@@ -47,6 +47,18 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 		$this->dataMapper = $dataMapper;
 	}
 
+	/**
+	 * Do not include pid in queries
+	 *
+	 * @return void
+	 */
+	public function initializeObject() {
+		/** @var $defaultQuerySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
+		$defaultQuerySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+		$defaultQuerySettings->setRespectStoragePage(FALSE);
+		$this->setDefaultQuerySettings($defaultQuerySettings);
+	}
+
 	/**
 	 * Count all extensions
 	 *
@@ -61,7 +73,7 @@ class ExtensionRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 	/**
 	 * Finds all extensions
 	 *
-	 * @return array|Tx_Extbase_Persistence_QueryResultInterface
+	 * @return array|\TYPO3\CMS\Extbase\Persistence\QueryResultInterface
 	 */
 	public function findAll() {
 		$query = $this->createQuery();
diff --git a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
index fa50ca49f58fcbfad1aab223a6b05a0ac97a5251..945ea890c3c07fca378ee2a05353c00f24ef9175 100644
--- a/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
+++ b/typo3/sysext/extensionmanager/Classes/Domain/Repository/RepositoryRepository.php
@@ -32,6 +32,18 @@ namespace TYPO3\CMS\Extensionmanager\Domain\Repository;
  */
 class RepositoryRepository extends \TYPO3\CMS\Extbase\Persistence\Repository {
 
+	/**
+	 * Do not include pid in queries
+	 *
+	 * @return void
+	 */
+	public function initializeObject() {
+		/** @var $defaultQuerySettings \TYPO3\CMS\Extbase\Persistence\Generic\QuerySettingsInterface */
+		$defaultQuerySettings = $this->objectManager->create('TYPO3\\CMS\\Extbase\\Persistence\\Generic\\QuerySettingsInterface');
+		$defaultQuerySettings->setRespectStoragePage(FALSE);
+		$this->setDefaultQuerySettings($defaultQuerySettings);
+	}
+
 	/**
 	 * Updates ExtCount and lastUpdated in Repository eg after import
 	 *
diff --git a/typo3/sysext/extensionmanager/ext_tables.sql b/typo3/sysext/extensionmanager/ext_tables.sql
index f3a3c2acc39d6369586e9af625f7acf66f85ae60..a2ef5941c21c8144304bbc4040ebb0cc0d6b8f07 100644
--- a/typo3/sysext/extensionmanager/ext_tables.sql
+++ b/typo3/sysext/extensionmanager/ext_tables.sql
@@ -3,6 +3,7 @@
 #
 CREATE TABLE tx_extensionmanager_domain_model_repository (
   uid int(11) unsigned NOT NULL auto_increment,
+  pid int(11) unsigned DEFAULT '0' NOT NULL,
   title varchar(150) NOT NULL default '',
   description mediumtext,
   wsdl_url varchar(100) NOT NULL default '',
@@ -17,6 +18,7 @@ CREATE TABLE tx_extensionmanager_domain_model_repository (
 #
 CREATE TABLE tx_extensionmanager_domain_model_extension (
   uid int(11) NOT NULL auto_increment,
+  pid int(11) unsigned DEFAULT '0' NOT NULL,
   extension_key varchar(60) NOT NULL default '',
   repository int(11) unsigned NOT NULL default '1',
   version varchar(10) NOT NULL default '',