Fix PrimaryField selection heuristics