diff --git a/srv/src/main/java/my/bookshop/handlers/CatalogServiceHandler.java b/srv/src/main/java/my/bookshop/handlers/CatalogServiceHandler.java
index 8230e2e6..e61c1821 100644
--- a/srv/src/main/java/my/bookshop/handlers/CatalogServiceHandler.java
+++ b/srv/src/main/java/my/bookshop/handlers/CatalogServiceHandler.java
@@ -72,13 +72,13 @@ class CatalogServiceHandler implements EventHandler {
 	}
 
 	@Before(entity = Books_.CDS_NAME)
-	public void beforeReadBooks(CdsReadEventContext context) {
+	public void alwaysSelectStock(CdsReadEventContext context) {
 		CqnSelect copy = CQL.copy(context.getCqn(), new Modifier() {
 			@Override
 			public List<CqnSelectListItem> items(List<CqnSelectListItem> items) {
-				CqnSelectListItem stock = CQL.get("stock");
-				if (!items.contains(stock)) {
-					items.add(stock);
+				var paths = items.stream().filter(i -> i.isRef()).map(i -> i.asRef().path()).collect(Collectors.toSet());
+				if (paths.contains(Books.TITLE) && !paths.contains(Books.STOCK)) {
+					items.add(CQL.get(Books.STOCK));
 				}
 				return items;
 			}
diff --git a/srv/src/main/java/my/bookshop/health/AppActuator.java b/srv/src/main/java/my/bookshop/health/AppActuator.java
index e661e1f4..ac48833d 100644
--- a/srv/src/main/java/my/bookshop/health/AppActuator.java
+++ b/srv/src/main/java/my/bookshop/health/AppActuator.java
@@ -2,7 +2,6 @@
 
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import org.springframework.boot.actuate.endpoint.annotation.Endpoint;
 import org.springframework.boot.actuate.endpoint.annotation.ReadOperation;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
@@ -14,7 +13,7 @@
  */
 @Component
 @ConditionalOnClass(Endpoint.class)
-@Endpoint(id = "bookshop", enableByDefault = true)
+@Endpoint(id = "bookshop")
 public class AppActuator {
 
 	@ReadOperation