Fixing fingerprint search, part 1