Moved nullable condition to case unsensitive field only