Fix modal using blank? over nil? for some fields