These changes refactor the finder to make it easier to remove the legacy queries in the future.
Attach a file by drag & drop or click to upload
