diff --git a/modules/query/src/main/scala/docspell/query/ItemQuery.scala b/modules/query/src/main/scala/docspell/query/ItemQuery.scala
index 2a6759a2..435d2da2 100644
--- a/modules/query/src/main/scala/docspell/query/ItemQuery.scala
+++ b/modules/query/src/main/scala/docspell/query/ItemQuery.scala
@@ -1,6 +1,7 @@
 package docspell.query
 
 import cats.data.{NonEmptyList => Nel}
+
 import docspell.query.ItemQuery.Attr.{DateAttr, StringAttr}
 
 /** A query evaluates to `true` or `false` given enough details about
diff --git a/modules/query/src/main/scala/docspell/query/ItemQueryParser.scala b/modules/query/src/main/scala/docspell/query/ItemQueryParser.scala
index 985c5be7..c2b9ffbe 100644
--- a/modules/query/src/main/scala/docspell/query/ItemQueryParser.scala
+++ b/modules/query/src/main/scala/docspell/query/ItemQueryParser.scala
@@ -1,9 +1,9 @@
 package docspell.query
 
-import docspell.query.internal.ExprParser
-
 import scala.scalajs.js.annotation._
 
+import docspell.query.internal.ExprParser
+
 @JSExportTopLevel("DsItemQueryParser")
 object ItemQueryParser {
 
diff --git a/modules/query/src/main/scala/docspell/query/internal/AttrParser.scala b/modules/query/src/main/scala/docspell/query/internal/AttrParser.scala
index 6cd1c8b3..f9520a61 100644
--- a/modules/query/src/main/scala/docspell/query/internal/AttrParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/AttrParser.scala
@@ -1,6 +1,7 @@
 package docspell.query.internal
 
 import cats.parse.{Parser => P}
+
 import docspell.query.ItemQuery.Attr
 
 object AttrParser {
diff --git a/modules/query/src/main/scala/docspell/query/internal/BasicParser.scala b/modules/query/src/main/scala/docspell/query/internal/BasicParser.scala
index 36694b10..a3e13742 100644
--- a/modules/query/src/main/scala/docspell/query/internal/BasicParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/BasicParser.scala
@@ -1,7 +1,7 @@
 package docspell.query.internal
 
 import cats.data.{NonEmptyList => Nel}
-import cats.parse.{Parser0, Parser => P}
+import cats.parse.{Parser => P, Parser0}
 
 object BasicParser {
   private[this] val whitespace: P[Unit] = P.charIn(" \t\r\n").void
diff --git a/modules/query/src/main/scala/docspell/query/internal/DateParser.scala b/modules/query/src/main/scala/docspell/query/internal/DateParser.scala
index 43ae6221..49cc0b58 100644
--- a/modules/query/src/main/scala/docspell/query/internal/DateParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/DateParser.scala
@@ -2,6 +2,7 @@ package docspell.query.internal
 
 import cats.implicits._
 import cats.parse.{Numbers, Parser => P}
+
 import docspell.query.Date
 
 object DateParser {
diff --git a/modules/query/src/main/scala/docspell/query/internal/ExprParser.scala b/modules/query/src/main/scala/docspell/query/internal/ExprParser.scala
index 7c7a6d6a..d9c7d313 100644
--- a/modules/query/src/main/scala/docspell/query/internal/ExprParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/ExprParser.scala
@@ -1,6 +1,7 @@
 package docspell.query.internal
 
 import cats.parse.{Parser => P}
+
 import docspell.query.ItemQuery._
 
 object ExprParser {
diff --git a/modules/query/src/main/scala/docspell/query/internal/OperatorParser.scala b/modules/query/src/main/scala/docspell/query/internal/OperatorParser.scala
index 76a14e60..d9d2944d 100644
--- a/modules/query/src/main/scala/docspell/query/internal/OperatorParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/OperatorParser.scala
@@ -1,6 +1,7 @@
 package docspell.query.internal
 
 import cats.parse.{Parser => P}
+
 import docspell.query.ItemQuery._
 
 object OperatorParser {
diff --git a/modules/query/src/main/scala/docspell/query/internal/SimpleExprParser.scala b/modules/query/src/main/scala/docspell/query/internal/SimpleExprParser.scala
index 5865ad80..d10fc231 100644
--- a/modules/query/src/main/scala/docspell/query/internal/SimpleExprParser.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/SimpleExprParser.scala
@@ -1,6 +1,7 @@
 package docspell.query.internal
 
 import cats.parse.{Parser => P}
+
 import docspell.query.ItemQuery.Expr.CustomFieldMatch
 import docspell.query.ItemQuery._
 
diff --git a/modules/query/src/main/scala/docspell/query/internal/StringUtil.scala b/modules/query/src/main/scala/docspell/query/internal/StringUtil.scala
index 28a24872..fb81ce14 100644
--- a/modules/query/src/main/scala/docspell/query/internal/StringUtil.scala
+++ b/modules/query/src/main/scala/docspell/query/internal/StringUtil.scala
@@ -22,7 +22,7 @@ package docspell.query.internal
 
 // modified, from
 // https://github.com/typelevel/cats-parse/blob/e7a58ef15925358fbe7a4c0c1a204296e366a06c/bench/src/main/scala/cats/parse/bench/self.scala
-import cats.parse.{Parser0 => P0, Parser => P}
+import cats.parse.{Parser => P, Parser0 => P0}
 
 object StringUtil {
 
diff --git a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
index 729f2f88..836927d0 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/routes/ItemRoutes.scala
@@ -4,6 +4,7 @@ import cats.Monoid
 import cats.data.NonEmptyList
 import cats.effect._
 import cats.implicits._
+
 import docspell.backend.BackendApp
 import docspell.backend.auth.AuthToken
 import docspell.backend.ops.OCustomFields.{RemoveValue, SetValue}
@@ -18,6 +19,7 @@ import docspell.restserver.conv.Conversions
 import docspell.restserver.http4s.BinaryUtil
 import docspell.restserver.http4s.Responses
 import docspell.restserver.http4s.{QueryParam => QP}
+
 import org.http4s.HttpRoutes
 import org.http4s.circe.CirceEntityDecoder._
 import org.http4s.circe.CirceEntityEncoder._
diff --git a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
index 2f745dd8..561ad816 100644
--- a/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
+++ b/modules/store/src/main/scala/docspell/store/qb/generator/ItemQueryGenerator.scala
@@ -3,12 +3,14 @@ package docspell.store.qb.generator
 import java.time.{Instant, LocalDate}
 
 import cats.data.NonEmptyList
+
 import docspell.common._
-import docspell.query.{Date, ItemQuery}
 import docspell.query.ItemQuery._
-import docspell.store.qb.{Operator => QOp, _}
+import docspell.query.{Date, ItemQuery}
 import docspell.store.qb.DSL._
+import docspell.store.qb.{Operator => QOp, _}
 import docspell.store.records.{RCustomField, RCustomFieldValue, TagItemName}
+
 import doobie.util.Put
 
 object ItemQueryGenerator {
diff --git a/modules/store/src/main/scala/docspell/store/queries/QItem.scala b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
index aa07a4cc..7461cc8b 100644
--- a/modules/store/src/main/scala/docspell/store/queries/QItem.scala
+++ b/modules/store/src/main/scala/docspell/store/queries/QItem.scala
@@ -5,6 +5,7 @@ import cats.effect.Sync
 import cats.effect.concurrent.Ref
 import cats.implicits._
 import fs2.Stream
+
 import docspell.common.syntax.all._
 import docspell.common.{IdRef, _}
 import docspell.query.ItemQuery
@@ -13,6 +14,7 @@ import docspell.store.qb.DSL._
 import docspell.store.qb._
 import docspell.store.qb.generator.{ItemQueryGenerator, Tables}
 import docspell.store.records._
+
 import doobie.implicits._
 import doobie.{Query => _, _}
 import org.log4s.getLogger