diff --git a/bubble-server/src/main/java/bubble/model/app/AppData.java b/bubble-server/src/main/java/bubble/model/app/AppData.java
index caf3c999..34e0bc60 100644
--- a/bubble-server/src/main/java/bubble/model/app/AppData.java
+++ b/bubble-server/src/main/java/bubble/model/app/AppData.java
@@ -50,24 +50,24 @@ public class AppData extends IdentifiableBase implements AppTemplateEntity {
     @Override @Transient public String getName() { return getKey(); }
     public AppData setName(String n) { return setKey(n); }
 
-    @ECSearchable @ECField(index=10)
+    @ECField(index=10)
     @ECForeignKey(entity=Account.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String account;
 
-    @ECSearchable @ECField(index=20)
+    @ECSearchable(fkDepth=ECForeignKeySearchDepth.none) @ECField(index=20)
     @ECForeignKey(entity=BubbleApp.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String app;
     public boolean hasApp () { return app != null; }
 
-    @ECSearchable @ECField(index=30)
+    @ECSearchable(fkDepth=ECForeignKeySearchDepth.none) @ECField(index=30)
     @ECForeignKey(entity=AppMatcher.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String matcher;
     public boolean hasMatcher() { return matcher != null; }
 
-    @ECSearchable @ECField(index=40)
+    @ECSearchable(fkDepth=ECForeignKeySearchDepth.none) @ECField(index=40)
     @ECForeignKey(entity=AppSite.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String site;
diff --git a/bubble-server/src/main/java/bubble/model/app/AppMatcher.java b/bubble-server/src/main/java/bubble/model/app/AppMatcher.java
index f9244a22..9740b64b 100644
--- a/bubble-server/src/main/java/bubble/model/app/AppMatcher.java
+++ b/bubble-server/src/main/java/bubble/model/app/AppMatcher.java
@@ -40,7 +40,7 @@ public class AppMatcher extends IdentifiableBase implements AppTemplateEntity {
     public static final String[] VALUE_FIELDS = {"fqdn", "urlRegex", "rule", "template", "enabled"};
     public static final String[] CREATE_FIELDS = ArrayUtil.append(VALUE_FIELDS, "name", "site");
 
-    @ECSearchable @ECField(index=10)
+    @ECField(index=10)
     @ECForeignKey(entity=Account.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String account;
diff --git a/bubble-server/src/main/java/bubble/model/app/AppRule.java b/bubble-server/src/main/java/bubble/model/app/AppRule.java
index d840d4e1..4d12534d 100644
--- a/bubble-server/src/main/java/bubble/model/app/AppRule.java
+++ b/bubble-server/src/main/java/bubble/model/app/AppRule.java
@@ -51,7 +51,7 @@ public class AppRule extends IdentifiableBaseParentEntity implements AppTemplate
     @ECIndex @Column(nullable=false, updatable=false, length=200)
     @Getter @Setter private String name;
 
-    @ECSearchable @ECField(index=20)
+    @ECField(index=20)
     @ECForeignKey(entity=Account.class)
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String account;
diff --git a/bubble-server/src/main/java/bubble/model/app/BubbleApp.java b/bubble-server/src/main/java/bubble/model/app/BubbleApp.java
index f687bac4..774e7c43 100644
--- a/bubble-server/src/main/java/bubble/model/app/BubbleApp.java
+++ b/bubble-server/src/main/java/bubble/model/app/BubbleApp.java
@@ -48,7 +48,7 @@ public class BubbleApp extends IdentifiableBaseParentEntity implements AccountTe
     @ECIndex @Column(nullable=false, updatable=false, length=200)
     @Getter @Setter private String name;
 
-    @ECSearchable @ECField(index=20)
+    @ECField(index=20)
     @ECForeignKey(entity=Account.class)
     @Column(length=UUID_MAXLEN, nullable=false, updatable=false)
     @Getter @Setter private String account;