Trialing an optimisation for duplicate finder
Extended optimisation