Issue 1590: Add potential match indexes
Merge pull request #1582 from elzj/indexes-potential-matches

Issue 1590: Add potential match indexes