diff --git a/lib/data/models/company_model.dart b/lib/data/models/company_model.dart
index 2fca114c4..e7cde10ee 100644
--- a/lib/data/models/company_model.dart
+++ b/lib/data/models/company_model.dart
@@ -1317,7 +1317,7 @@ abstract class SettingsEntity
   int get numberOfInvoiceTaxRates;
 
   @nullable
-  @BuiltValueField(wireName: 'enabled_tax_rates')
+  @BuiltValueField(wireName: 'invoice_item_taxes')
   int get numberOfItemTaxRates;
 
   @nullable
diff --git a/lib/data/models/company_model.g.dart b/lib/data/models/company_model.g.dart
index 8a3d5f697..3021f9a29 100644
--- a/lib/data/models/company_model.g.dart
+++ b/lib/data/models/company_model.g.dart
@@ -1314,7 +1314,7 @@ class _$SettingsEntitySerializer
     }
     if (object.numberOfItemTaxRates != null) {
       result
-        ..add('enabled_tax_rates')
+        ..add('invoice_item_taxes')
         ..add(serializers.serialize(object.numberOfItemTaxRates,
             specifiedType: const FullType(int)));
     }
@@ -2113,7 +2113,7 @@ class _$SettingsEntitySerializer
           result.numberOfInvoiceTaxRates = serializers.deserialize(value,
               specifiedType: const FullType(int)) as int;
           break;
-        case 'enabled_tax_rates':
+        case 'invoice_item_taxes':
           result.numberOfItemTaxRates = serializers.deserialize(value,
               specifiedType: const FullType(int)) as int;
           break;
diff --git a/lib/data/repositories/quote_repository.dart b/lib/data/repositories/quote_repository.dart
index 5ea00c741..14c0f4417 100644
--- a/lib/data/repositories/quote_repository.dart
+++ b/lib/data/repositories/quote_repository.dart
@@ -32,7 +32,7 @@ class QuoteRepository {
   Future<BuiltList<InvoiceEntity>> loadList(
       Credentials credentials, int updatedAt) async {
     String url = credentials.url +
-        '/quotes?include=invitations&invoice_type_id=2&is_recurring=0';
+        '/quotes?include=invitations';
 
     if (updatedAt > 0) {
       url += '&updated_at=${updatedAt - kUpdatedAtBufferSeconds}';
diff --git a/lib/ui/settings/custom_fields.dart b/lib/ui/settings/custom_fields.dart
index ff0f7dce0..5a16f50f1 100644
--- a/lib/ui/settings/custom_fields.dart
+++ b/lib/ui/settings/custom_fields.dart
@@ -216,7 +216,7 @@ class CustomFormField extends StatefulWidget {
 class _CustomFormFieldState extends State<CustomFormField> {
   final _customFieldController = TextEditingController();
   final _optionsController = TextEditingController();
-  String _fieldType = kFieldTypeMultiLineText;
+  String _fieldType = kFieldTypeSingleLineText;
 
   List<TextEditingController> _controllers = [];
   final _debouncer = Debouncer();
@@ -240,23 +240,27 @@ class _CustomFormFieldState extends State<CustomFormField> {
     _controllers
         .forEach((dynamic controller) => controller.removeListener(_onChanged));
 
-    if ('${widget.value ?? ''}'.isNotEmpty && widget.value.contains('|')) {
-      final parts = widget.value.split('|');
-      _customFieldController.text = parts[0];
-      switch (parts[1]) {
-        case kFieldTypeSingleLineText:
-          _fieldType = kFieldTypeSingleLineText;
-          break;
-        case kFieldTypeDate:
-          _fieldType = kFieldTypeDate;
-          break;
-        case kFieldTypeSwitch:
-          _fieldType = kFieldTypeSwitch;
-          break;
-        default:
-          _fieldType = kFieldTypeDropdown;
-          _optionsController.text = parts[1];
-          break;
+    if ('${widget.value ?? ''}'.isNotEmpty) {
+      if (widget.value.contains('|')) {
+        final parts = widget.value.split('|');
+        _customFieldController.text = parts[0];
+        switch (parts[1]) {
+          case kFieldTypeSingleLineText:
+            _fieldType = kFieldTypeSingleLineText;
+            break;
+          case kFieldTypeDate:
+            _fieldType = kFieldTypeDate;
+            break;
+          case kFieldTypeSwitch:
+            _fieldType = kFieldTypeSwitch;
+            break;
+          default:
+            _fieldType = kFieldTypeDropdown;
+            _optionsController.text = parts[1];
+            break;
+        }
+      } else {
+        _fieldType = kFieldTypeMultiLineText;
       }
     } else {
       _customFieldController.text = widget.value;