Added skipping of fields within conditionals