match latest familysearch model
fix generics definition