Switch set to list in DAO
Merge origin/master
Switch set to list in DAO and fix hbm