WIP: Rework find dialog