added check for field fields to skip in contains_fields function