diff --git a/Makefile b/Makefile
index f3c3c64..7e69bde 100644
--- a/Makefile
+++ b/Makefile
@@ -126,6 +126,7 @@ postgresdb:
 	@dropdb ${DB_NAME} || true
 	@echo "-> Create ${DB_NAME} database"
 	@createdb --owner=${DB_USERNAME} ${POSTGRES_INITDB_ARGS} ${DB_NAME}
+	@gunzip < ${DB_INIT_FILE} | psql --username=${DB_USERNAME} ${DB_NAME}
 
 run:
 	${MANAGE} runserver 8000
diff --git a/product_portfolio/views.py b/product_portfolio/views.py
index d19c1d4..96252c1 100644
--- a/product_portfolio/views.py
+++ b/product_portfolio/views.py
@@ -421,9 +421,10 @@ def tab_inventory(self):
         productcomponent_qs = self.filter_productcomponent.qs.order_by(
             "feature", "component", "name", "version"
         ).group_by("feature")
-        productpackage_qs = self.filter_productpackage.qs.order_by("feature", "package").group_by(
-            "feature"
-        )
+
+        productpackage_qs = self.filter_productpackage.qs.order_by(
+            "feature", "package__type", "package__namespace", "package__name"
+        ).group_by("feature")
 
         user = self.request.user
         dataspace = user.dataspace