Convert empty strings to null to prevent layout from rendering