diff --git a/bubble-server/src/main/java/bubble/model/bill/AccountPayment.java b/bubble-server/src/main/java/bubble/model/bill/AccountPayment.java
index 6462f487..f32aec3b 100644
--- a/bubble-server/src/main/java/bubble/model/bill/AccountPayment.java
+++ b/bubble-server/src/main/java/bubble/model/bill/AccountPayment.java
@@ -64,7 +64,7 @@ public class AccountPayment extends IdentifiableBase implements HasAccountNoName
     @Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL")
     @Getter @Setter private Long amount = 0L;
 
-    @ECSearchable @ECField(index=90, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=90)
     @ECIndex @Column(nullable=false, updatable=false, length=10)
     @Getter @Setter private String currency;
 
@@ -72,11 +72,11 @@ public class AccountPayment extends IdentifiableBase implements HasAccountNoName
     @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(100000+ENC_PAD)+") NOT NULL")
     @Getter @Setter private String info;
 
-    @ECSearchable @ECField(index=110, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=110, type=EntityFieldType.error)
     @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(200+ENC_PAD)+")")
     @Getter @Setter private String violation;
 
-    @ECSearchable @ECField(index=120, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=120, type=EntityFieldType.error)
     @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(10000+ENC_PAD)+")")
     @JsonIgnore @Getter @Setter private String exception;
 
diff --git a/bubble-server/src/main/java/bubble/model/bill/AccountPlan.java b/bubble-server/src/main/java/bubble/model/bill/AccountPlan.java
index 6187c976..14bf1124 100644
--- a/bubble-server/src/main/java/bubble/model/bill/AccountPlan.java
+++ b/bubble-server/src/main/java/bubble/model/bill/AccountPlan.java
@@ -120,7 +120,7 @@ public class AccountPlan extends IdentifiableBase implements HasAccount {
     @ECSearchable @ECField(index=140) @Column(nullable=false)
     @Getter @Setter private Boolean refundIssued = false;
 
-    @ECSearchable @ECField(index=150, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=150, type=EntityFieldType.error)
     @Getter @Setter private String refundError;
 
     // Fields below are used when creating a new plan, to also create the network associated with it
diff --git a/bubble-server/src/main/java/bubble/model/bill/Bill.java b/bubble-server/src/main/java/bubble/model/bill/Bill.java
index 7669bef0..89237454 100644
--- a/bubble-server/src/main/java/bubble/model/bill/Bill.java
+++ b/bubble-server/src/main/java/bubble/model/bill/Bill.java
@@ -74,7 +74,7 @@ public class Bill extends IdentifiableBase implements HasAccountNoName {
     @Type(type=ENCRYPTED_LONG) @Column(updatable=false, columnDefinition="varchar("+(ENC_LONG)+") NOT NULL")
     @Getter @Setter private Long price = 0L;
 
-    @ECSearchable @ECField(index=110, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=110)
     @ECIndex @Column(nullable=false, updatable=false, length=10)
     @Getter @Setter private String currency;
 
diff --git a/bubble-server/src/main/java/bubble/model/bill/BubblePlan.java b/bubble-server/src/main/java/bubble/model/bill/BubblePlan.java
index 09787f4e..e7d47ea9 100644
--- a/bubble-server/src/main/java/bubble/model/bill/BubblePlan.java
+++ b/bubble-server/src/main/java/bubble/model/bill/BubblePlan.java
@@ -86,7 +86,7 @@ public class BubblePlan extends IdentifiableBase implements HasAccount, HasPrior
     @ECIndex @Column(nullable=false)
     @Getter @Setter private Long price;
 
-    @ECSearchable @ECField(index=70, type=EntityFieldType.opaque_string)
+    @ECSearchable @ECField(index=70)
     @ECIndex @Column(nullable=false, length=10)
     @Getter @Setter private String currency = "USD";
 
diff --git a/bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java b/bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java
index 58df3a7b..4c75bd95 100644
--- a/bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java
+++ b/bubble-server/src/main/java/bubble/model/cloud/BubbleBackup.java
@@ -64,7 +64,7 @@ public class BubbleBackup extends IdentifiableBase implements HasAccount {
     @Getter @Setter private BackupStatus status;
     public boolean success () { return status == BackupStatus.backup_completed; }
 
-    @ECSearchable(filter=true) @ECField(index=60, type=EntityFieldType.opaque_string)
+    @ECSearchable(filter=true) @ECField(index=60)
     @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")")
     @Getter private String error;
     public BubbleBackup setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; }
diff --git a/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java b/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java
index f55017bd..f2f783cf 100644
--- a/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java
+++ b/bubble-server/src/main/java/bubble/model/cloud/BubbleNetwork.java
@@ -93,7 +93,7 @@ public class BubbleNetwork extends IdentifiableBase implements HasNetwork, HasBu
     @Column(nullable=false, updatable=false, length=UUID_MAXLEN)
     @Getter @Setter private String domain;
 
-    @ECSearchable(filter=true) @ECField(index=40, type=EntityFieldType.opaque_string)
+    @ECSearchable(filter=true) @ECField(index=40, type=EntityFieldType.fqdn)
     @ECIndex @Column(nullable=false, updatable=false, length=DOMAIN_NAME_MAXLEN)
     @Getter @Setter private String domainName;  // denormalized from BubbleDomain
 
diff --git a/bubble-server/src/main/java/bubble/model/cloud/notify/NotificationBase.java b/bubble-server/src/main/java/bubble/model/cloud/notify/NotificationBase.java
index ce820761..8b595a61 100644
--- a/bubble-server/src/main/java/bubble/model/cloud/notify/NotificationBase.java
+++ b/bubble-server/src/main/java/bubble/model/cloud/notify/NotificationBase.java
@@ -83,7 +83,7 @@ public class NotificationBase extends IdentifiableBase implements HasAccountNoNa
     @Transient public NotificationReceipt getReceipt () { return receiptJson == null ? null : json(receiptJson, NotificationReceipt.class); }
     public <T extends NotificationBase> T setReceipt (NotificationReceipt receipt) { return (T) setReceiptJson(receipt == null ? null : json(receiptJson)); }
 
-    @ECSearchable(filter=true) @ECField(index=100, type=EntityFieldType.opaque_string)
+    @ECSearchable(filter=true) @ECField(index=100)
     @Type(type=ENCRYPTED_STRING) @Column(updatable=false, columnDefinition="varchar("+(ERROR_MAXLEN+ENC_PAD)+")")
     @JsonIgnore @Getter private String error;
     public NotificationBase setError (String err) { this.error = ellipsis(err, ERROR_MAXLEN); return this; }
diff --git a/utils/cobbzilla-wizard b/utils/cobbzilla-wizard
index 99a536b4..10e833a2 160000
--- a/utils/cobbzilla-wizard
+++ b/utils/cobbzilla-wizard
@@ -1 +1 @@
-Subproject commit 99a536b4085a56803d73b5f20a6da9f39db78f98
+Subproject commit 10e833a28dd0ebe1152a059576eeba48019440ef