diff --git a/lib/model/field.dart b/lib/model/field.dart
index 3f8095f..d047ba7 100644
--- a/lib/model/field.dart
+++ b/lib/model/field.dart
@@ -110,8 +110,10 @@ class FieldViewModel {
     }
 
     if (key == null && browserModel != null) {
-      // We might come across old bad data so make every effort to select a new displayName for such fields. Ultimately, we'll have to ignore and eventually delete any fields that contain no useful data.
+      // We might come across old bad data so make every effort to select a new displayName for such
+      // fields. Ultimately, we'll have to ignore and eventually delete any fields that contain no useful data.
       localisedCommonName = browserModel.name?.nullIfBlank() ??
+          browserModel.uuid?.nullIfBlank() ??
           browserModel.matcherConfigs
               ?.firstWhereOrNull((mc) => mc.matcherType == FieldMatcherType.Custom)
               ?.customMatcher
diff --git a/lib/widgets/entry.dart b/lib/widgets/entry.dart
index cb02aac..de83e10 100644
--- a/lib/widgets/entry.dart
+++ b/lib/widgets/entry.dart
@@ -9,8 +9,6 @@ import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:jiffy/jiffy.dart';
 import 'package:kdbx/kdbx.dart';
-//TODO: consider retaining this package if it gets fixed for API 34 by the time
-// Google have fixed the emulator crashes that block development for Android 14
 import 'package:barcode_scan2/barcode_scan2.dart' as barcode;
 import 'package:base32/base32.dart';
 import 'package:flutter_speed_dial/flutter_speed_dial.dart';
diff --git a/pubspec.lock b/pubspec.lock
index 142edeb..0cf6337 100644
--- a/pubspec.lock
+++ b/pubspec.lock
@@ -37,8 +37,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: api34
-      resolved-ref: "86f3a356aa66c76798fc70ab595e12a404c6e6aa"
+      ref: master
+      resolved-ref: d256c1930bd32f0e0aafa273e6610a20d90cbf1a
       url: "https://github.com/kee-org/argon2_ffi.git"
     source: git
     version: "2.0.1"
@@ -301,8 +301,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: api34
-      resolved-ref: "6fd75d9fff7952b6df5c5791c42cb8bab5cd9a8f"
+      ref: master
+      resolved-ref: "8d742765ddda32c113d630c35577c02feb3df102"
       url: "https://github.com/kee-org/flutter_autofill_service.git"
     source: git
     version: "0.18.1"
@@ -335,8 +335,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: api34
-      resolved-ref: "12785f3866cb753104aa820f4060ef0a32561253"
+      ref: main
+      resolved-ref: e443da8e778b67567a73de2419ddf6a50536c5e4
       url: "https://github.com/kee-org/flutter_inapp_purchase"
     source: git
     version: "5.6.0+1"
@@ -529,8 +529,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: configv2
-      resolved-ref: f8b5408e8dd965afd8dcd06b867cda1fc7ec9935
+      ref: master
+      resolved-ref: "16a7e20ebb7f8d5180c8baf408431353ee5e8a8a"
       url: "https://github.com/kee-org/kdbx.dart.git"
     source: git
     version: "0.6.0+4"
@@ -876,8 +876,8 @@ packages:
     dependency: "direct main"
     description:
       path: "."
-      ref: api34
-      resolved-ref: "4ae55ee4d8895aba399f3cc9cf8d7fdab8faa543"
+      ref: master
+      resolved-ref: "7b4543cce4af670140ea19c67bfae67dbdd890db"
       url: "https://github.com/kee-org/sensitive_clipboard"
     source: git
     version: "1.0.0"
diff --git a/pubspec.yaml b/pubspec.yaml
index 61a5052..cbc924f 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -15,7 +15,7 @@ publish_to: 'none' # Remove this line if you wish to publish to pub.dev
 # In iOS, build-name is used as CFBundleShortVersionString while build-number used as CFBundleVersion.
 # Read more about iOS versioning at
 # https://developer.apple.com/library/archive/documentation/General/Reference/InfoPlistKeyReference/Articles/CoreFoundationKeys.html
-version: 2.2.1+55
+version: 2.3.0+55
 
 environment:
   sdk: '>=3.0.0 <4.0.0'
@@ -28,7 +28,7 @@ dependencies:
   kdbx:
     git:
       url: https://github.com/kee-org/kdbx.dart.git
-      ref: configv2
+      ref: master
   path_provider: ^2.1.1
   biometric_storage:
     git:
@@ -41,11 +41,11 @@ dependencies:
   argon2_ffi:
     git:
       url: https://github.com/kee-org/argon2_ffi.git
-      ref: api34
+      ref: master
   flutter_autofill_service:
     git:
       url: https://github.com/kee-org/flutter_autofill_service.git
-      ref: api34
+      ref: master
   bloc: ^8.1.2
   flutter_bloc: ^8.1.3
   fluro: ^2.0.5
@@ -111,11 +111,11 @@ dependencies:
   flutter_inapp_purchase: 
     git:
       url: https://github.com/kee-org/flutter_inapp_purchase
-      ref: api34
+      ref: main
   sensitive_clipboard: 
     git:
       url: https://github.com/kee-org/sensitive_clipboard
-      ref: api34
+      ref: master
   rate_my_app: 2.0.0 # fix until at least > 2.0.0
   archive: ^3.4.6
   device_info_plus: ^9.1.0