added support for some empty fields in admin