2 files changed, 16 insertions, 15 deletions
diff --git a/pkg/domain/infra/abi/healthcheck.go b/pkg/domain/infra/abi/healthcheck.go
index 351bf4f7e..4e925ef56 100644
--- a/pkg/domain/infra/abi/healthcheck.go
+++ b/pkg/domain/infra/abi/healthcheck.go
@@ -3,7 +3,6 @@ package abi
 import (
 	"context"
 
-	"github.com/containers/libpod/libpod"
 	"github.com/containers/libpod/libpod/define"
 	"github.com/containers/libpod/pkg/domain/entities"
 )
@@ -13,9 +12,9 @@ func (ic *ContainerEngine) HealthCheckRun(ctx context.Context, nameOrId string,
 	if err != nil {
 		return nil, err
 	}
-	hcStatus := "unhealthy"
-	if status == libpod.HealthCheckSuccess {
-		hcStatus = "healthy"
+	hcStatus := define.HealthCheckUnhealthy
+	if status == define.HealthCheckSuccess {
+		hcStatus = define.HealthCheckHealthy
 	}
 	report := define.HealthCheckResults{
 		Status: hcStatus,
diff --git a/pkg/domain/infra/abi/images_list.go b/pkg/domain/infra/abi/images_list.go
index c559e250c..3034e36ec 100644
--- a/pkg/domain/infra/abi/images_list.go
+++ b/pkg/domain/infra/abi/images_list.go
@@ -13,14 +13,7 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 		err    error
 	)
 
-	// TODO: Future work support for domain.Filters
-	// filters := utils.ToLibpodFilters(opts.Filters)
-
-	if len(opts.Filter) > 0 {
-		images, err = ir.Libpod.ImageRuntime().GetImagesWithFilters(opts.Filter)
-	} else {
-		images, err = ir.Libpod.ImageRuntime().GetImages()
-	}
+	images, err = ir.Libpod.ImageRuntime().GetImagesWithFilters(opts.Filter)
 	if err != nil {
 		return nil, err
 	}
@@ -40,9 +33,18 @@ func (ir *ImageEngine) List(ctx context.Context, opts entities.ImageListOptions)
 				}
 			}
 		} else {
-			repoTags, _ = img.RepoTags()
-			if len(repoTags) == 0 {
-				continue
+			repoTags, err = img.RepoTags()
+			if err != nil {
+				return nil, err
+			}
+			if len(img.Names()) == 0 {
+				parent, err := img.IsParent(ctx)
+				if err != nil {
+					return nil, err
+				}
+				if parent {
+					continue
+				}
 			}
 		}