This changes also introduces a legacy finder that will help us to remove those queries in the future.
Attach a file by drag & drop or click to upload
