Huge speed boost for find-by-values