Eliminated generic FIELD_ORIGIN search condition.