Fix more sonar issues in models: yaml to dao

No match.