Rewrite finders to use datom index lookup