diff --git a/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BottleneckSuggestionProvider.java b/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BottleneckSuggestionProvider.java
index 96a49dc..19a9221 100644
--- a/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BottleneckSuggestionProvider.java
+++ b/analyzer/java/com/engflow/bazel/invocation/analyzer/suggestionproviders/BottleneckSuggestionProvider.java
@@ -134,7 +134,8 @@ public SuggestionOutput getSuggestions(DataManager dataManager) {
       final List<Caveat> caveats = new ArrayList<>();
       var flagForTargetInclusionEnabled =
           dataManager.getDatum(FlagValueExperimentalProfileIncludeTargetLabel.class);
-      if (!flagForTargetInclusionEnabled.isProfileIncludeTargetLabelEnabled()) {
+      if (suggestions.size() > 0
+          && !flagForTargetInclusionEnabled.isProfileIncludeTargetLabelEnabled()) {
         caveats.add(
             SuggestionProviderUtil.createCaveat(
                 String.format(
@@ -274,11 +275,9 @@ private String suggestTargetsOrActions(BottleneckStats bottleneck) {
               }
               sb.append("\t\tAction duration: ");
               sb.append(formatDuration(event.completeEvent.duration));
-              sb.append("\n");
               if (event.isCropped()) {
-                sb.append("\t\tDuration within bottleneck: ");
+                sb.append("\n\t\tDuration within bottleneck: ");
                 sb.append(formatDuration(event.croppedDuration));
-                sb.append("\n");
               }
               return sb.toString();
             })