diff --git a/mfa/TrustedDevice.py b/mfa/TrustedDevice.py
index 94b2136..812e13e 100644
--- a/mfa/TrustedDevice.py
+++ b/mfa/TrustedDevice.py
@@ -62,7 +62,7 @@ def add(request):
         key=request.POST["key"].replace("-","").replace(" ","").upper()
         context["username"] = request.POST["username"]
         context["key"] = request.POST["key"]
-        trusted_keys=User_Keys.objects.filter(username=request.POST["username"],properties__has="$.key="+key)
+        trusted_keys=User_Keys.objects.filter(username=request.POST["username"],properties__iregex=rf'{key}')
         cookie=False
         if trusted_keys.exists():
             tk=trusted_keys[0]
diff --git a/mfa/U2F.py b/mfa/U2F.py
index f7da5dc..04d4c12 100644
--- a/mfa/U2F.py
+++ b/mfa/U2F.py
@@ -52,7 +52,7 @@ def validate(request,username):
     challenge = request.session.pop('_u2f_challenge_')
     device, c, t = complete_authentication(challenge, data, [settings.U2F_APPID])
 
-    key=User_Keys.objects.get(username=username,properties__shas="$.device.publicKey=%s"%device["publicKey"])
+    key = User_Keys.objects.get(username=username, properties__iregex=rf'{device["publicKey"]}')
     key.last_used=timezone.now()
     key.save()
     mfa = {"verified": True, "method": "U2F","id":key.id}