FYI I'd also update the search code like so to make it much easier to read since it's easier to spot the diff when same pieces are in the same places (not suggesting to redo this in the whole code as it's too manual of a process, but that's just what I did anyway when adjusting this piece)
FYI I'd also update the search code like so to make it much easier to read since it's easier to spot the diff when same pieces are in the same places (not suggesting to redo this in the whole code as it's too manual of a process, but that's just what I did anyway when adjusting this piece)