Fix manul deduction for first_or_default
Manual type deduction for group_join