Added emptyToNull() for maps