[FIX] When default is null - add it as empty string ""