Add default value if defined into the query (workflows do not work with null values)