fixes in custom fields
fixes
fixes
fixes
bugfix with empty element