Fix each_record_in_scope when conditions_for_collection needs some includes