Fixes to set param for the database
Fixes to set param for the database
Merge