Honor custom field value skip option