#49 Set parameter from = '' to = null for default value