diff --git a/artifactory/services/utils/aqlquerybuilder.go b/artifactory/services/utils/aqlquerybuilder.go
index 327ba7745..43373512a 100644
--- a/artifactory/services/utils/aqlquerybuilder.go
+++ b/artifactory/services/utils/aqlquerybuilder.go
@@ -349,7 +349,7 @@ func getQueryReturnFields(specFile *ArtifactoryCommonParams, requiredArtifactPro
 		return appendMissingFields(specFile.SortBy, returnFields)
 	}
 	if requiredArtifactProps != NONE {
-		// If any prop is needed we just adding all the properties to the result, in order to prevent the second props query.
+		// If any prop is needed we just add all the properties to the result.
 		return append(returnFields, "property")
 	}
 	return returnFields
diff --git a/artifactory/services/utils/artifactoryutils.go b/artifactory/services/utils/artifactoryutils.go
index dd6d662b8..9035700f1 100644
--- a/artifactory/services/utils/artifactoryutils.go
+++ b/artifactory/services/utils/artifactoryutils.go
@@ -209,7 +209,7 @@ func getBuildNumberFromArtifactory(buildName, buildNumber string, flags CommonCo
 func createBodyForLatestBuildRequest(buildName, buildNumber string) (body []byte, err error) {
 	buildJsonArray := []build{{buildName, buildNumber}}
 	body, err = json.Marshal(buildJsonArray)
-	errorutils.CheckError(err)
+	err = errorutils.CheckError(err)
 	return
 }
 
@@ -254,16 +254,9 @@ func filterAqlSearchResultsByBuild(specFile *ArtifactoryCommonParams, itemsToFil
 // Run AQL to retrieve all artifacts associated with a specific build.
 // Return a map of the artifacts SHA1.
 func fetchBuildArtifactsSha1(buildName, buildNumber string, flags CommonConf) (map[string]bool, error) {
-	var aqlSearchErr error
-	var buildAqlResponse []byte
-
 	buildQuery := createAqlQueryForBuild(buildName, buildNumber, buildIncludeQueryPart([]string{"name", "repo", "path", "actual_sha1"}))
 
-	buildAqlResponse, aqlSearchErr = ExecAql(buildQuery, flags)
-	if aqlSearchErr != nil {
-		return nil, aqlSearchErr
-	}
-	parsedBuildAqlResponse, err := parseAqlSearchResponse(buildAqlResponse)
+	parsedBuildAqlResponse, err := aqlSearch(buildQuery, flags)
 	if err != nil {
 		return nil, err
 	}
diff --git a/artifactory/services/utils/searchutil.go b/artifactory/services/utils/searchutil.go
index 1f83237c7..16c5a0921 100644
--- a/artifactory/services/utils/searchutil.go
+++ b/artifactory/services/utils/searchutil.go
@@ -74,8 +74,8 @@ func SearchBySpecWithAql(specFile *ArtifactoryCommonParams, flags CommonConf, re
 
 	// Filter results by build.
 	if specFile.Build != "" && len(results) > 0 {
-		// If requiredArtifactProps is set to All and 'includePropertiesInAqlForSpec' for specFile returned true, results contains properties for artifacts.
-		resultsArtifactsIncludeProperties := requiredArtifactProps == ALL && includePropertiesInAqlForSpec(specFile)
+		// If requiredArtifactProps is not NONE and 'includePropertiesInAqlForSpec' for specFile returned true, results contains properties for artifacts.
+		resultsArtifactsIncludeProperties := requiredArtifactProps != NONE && includePropertiesInAqlForSpec(specFile)
 		results, err = filterAqlSearchResultsByBuild(specFile, results, flags, resultsArtifactsIncludeProperties)
 		if err != nil {
 			return nil, err