diff --git a/src/Foundation/Instances.hs b/src/Foundation/Instances.hs
index b7d6a555b..3090d20f4 100644
--- a/src/Foundation/Instances.hs
+++ b/src/Foundation/Instances.hs
@@ -5,6 +5,7 @@
 {-# LANGUAGE UndecidableInstances #-} -- for `MonadCrypto` and `MonadSecretBox`
 {-# LANGUAGE InstanceSigs #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-} -- otherwise, (Monad m, MonadSite UniWorX m) => MonadSecretBox m complains about redundant Monad m, but MonadSite UniWorX m comlains that Monad m is not deduceable
 
 module Foundation.Instances
   ( ButtonClass(..), YesodPersistBackend, AuthId, MonadCryptoKey
diff --git a/src/Jobs/Queue.hs b/src/Jobs/Queue.hs
index 25df1337f..acad18449 100644
--- a/src/Jobs/Queue.hs
+++ b/src/Jobs/Queue.hs
@@ -25,6 +25,7 @@ import qualified Data.List.NonEmpty as NonEmpty
 import qualified Data.HashMap.Strict as HashMap
 
 import qualified Data.Aeson as Aeson
+import qualified Data.Aeson.KeyMap as KeyMap
 
 import Control.Monad.Random (evalRand, mkStdGen, uniform)
 
@@ -109,7 +110,7 @@ queueJobUnsafe queuedJobWriteLastExec job = do
       JobNoQueueSame -> E.where_ $ queuedJob E.^. QueuedJobContent E.==. E.val (toJSON job)
       JobNoQueueSameTag ->
         let Aeson.Object obj = toJSON job
-            tag = obj HashMap.! "job"
+            tag = obj KeyMap.!? "job"
          in E.where_ $ (queuedJob E.^. QueuedJobContent) E.->. "job" E.==. E.val tag
 
   if