diff --git a/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts b/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
index 1dd0e47cef760c082161aa05384a8b2e5af4cac4..709081da8f09bfdcddae0e267fd7e607e31898e5 100644
--- a/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
+++ b/src/app/simulator/quality-conditions/daily-teaching-load/services/daily-teaching-load.service.ts
@@ -69,17 +69,14 @@ export class DailyTeachingLoadService implements NavigableComponentService {
     filters = new Array<string>(
       `min_year:"${currentYear}"`,
       `max_year:"${currentYear}"`,
-      `adm_dependency:["1","2","3"]`,
-      `education_level_mod:["1","2","4","5","6","8","9"]`,
+      `adm_dependency:["1","2","3"]`
     );
 
     if (shiftId === PeriodTeachingLoadEnum.diurnoParcial) {
-      filters.push(`integral_time:["0"]`);
       filters.push(`period:["1","2"]`);
     } else if (shiftId === PeriodTeachingLoadEnum.tempoIntegral) {
-      filters.push(`integral_time:["1"]`);
+      filters.push(`period:["4"]`);
     } else { // noturno
-      filters.push(`integral_time:["0"]`);
       filters.push(`period:["3"]`);
     }
 
diff --git a/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts b/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
index 444d78c1abd74b46dc9f7ffdfa9144cca4bfcf69..8f791e2a7b000fbaa3e5a89b8c392dfa8e79c6a8 100644
--- a/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
+++ b/src/app/simulator/quality-conditions/infrastructure-school-buildings/services/infrastructure-school-buildings.service.ts
@@ -20,13 +20,20 @@ import { NavigableComponentService } from '../../../shared/entities/base/navigab
 import { StagesSpecificities } from '../entities/stages-specificities';
 import { SourceInformationEnum } from './../../../../shared/entities/enums/source-information.enum';
 import { Footnote } from './../../../../shared/components/footnote/entities/footnote';
+import { CurrentYearMonthService } from '../../../shared/services/current-year-month/current-year-month.service';
 
 @Injectable({
   providedIn: 'root'
 })
 export class InfrastructureSchoolBuildingsService implements NavigableComponentService {
 
-  constructor(private httpService: HttpService, private utilitiesService: UtilitiesService, private sessionService: SessionService, private currentYearService: CurrentYearService) { }
+  constructor(
+    private httpService: HttpService, 
+    private utilitiesService: UtilitiesService, 
+    private sessionService: SessionService, 
+    private currentYearService: CurrentYearService,
+    private currentYearMonthService: CurrentYearMonthService
+  ) { }
 
   getData(pqrMode: boolean = false): Observable<InfrastructureSchoolsBuildings> {
     const infrastructureSchoolsBuildings: InfrastructureSchoolsBuildings = new InfrastructureSchoolsBuildings();
@@ -214,8 +221,11 @@ export class InfrastructureSchoolBuildingsService implements NavigableComponentS
   }
 
   setUnitPrice(infrastructureSchools: InfrastructureSchools, priceCub: Array<any>): void {
+    
+    const yearsMonth = this.currentYearMonthService.getCubCurrentYearMonth();
     for (let i = 0; i < infrastructureSchools.infrastructureBuildings.length; i++) {
       infrastructureSchools.infrastructureBuildings[i].unitPrice = _.first(priceCub).preco;
+      infrastructureSchools.infrastructureBuildings[i].referenceDate = _.first(yearsMonth).month + '/' + _.first(yearsMonth).year;
     }
   }
 
diff --git a/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts b/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
index b0c04c1c20f3301da703fba7097d011c6c16eba2..ae9b89db7210f4ae1ba24bae577e5a39e498d187 100644
--- a/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
+++ b/src/app/simulator/quality-conditions/teacher-number/service/teacher-number.service.ts
@@ -132,7 +132,6 @@ export class TeacherNumberService implements NavigableComponentService {
       `min_year:"${teacherCurrentYear}"`,
       `max_year:"${teacherCurrentYear}"`,
       `adm_dependency:["1","2","3"]`,
-      `education_level_mod:["1","2","4","5","6","8","9"]`
     );
 
     filters = filters.concat(filtersLocation);
diff --git a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
index dd6269bfefb669cf9df8ef2079925538ac9e2cec..e0efadc24d59df5b4bc19e250d862d94c380e740 100644
--- a/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
+++ b/src/app/simulator/results/budget-forecast-report/services/budget-forecast-report.service.ts
@@ -389,8 +389,7 @@ export class BudgetForecastReportService {
     let filters: Array<string> = new Array<string>(
       `min_year:"${teacherCurrentYear}"`,
       `max_year:"${teacherCurrentYear}"`,
-      `adm_dependency:["1","2","3"]`,
-      `education_level_mod:["1","2","4","5","6","8","9"]`
+      `adm_dependency:["1","2","3"]`
     );
 
     filters = filters.concat(filtersLocation);
diff --git a/src/app/simulator/shared/services/current-year/current-year.service.ts b/src/app/simulator/shared/services/current-year/current-year.service.ts
index d90079ed43d587cb3563e3065e2349d4ed02eab8..906ef62d467bf4d0e3e134a794f5b5fce2688d8d 100644
--- a/src/app/simulator/shared/services/current-year/current-year.service.ts
+++ b/src/app/simulator/shared/services/current-year/current-year.service.ts
@@ -144,7 +144,7 @@ export class CurrentYearService {
   }
 
   getOutOfSchoolPopulationCurrentYear(): number {
-    return 2017;
+    return 2018;
   }
 
   private processCurrentYears(currentYearKey: string, partialUrl: string): void {
diff --git a/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts b/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
index 64592b0890f842fa2c91691f9031f601a2d25c40..891cbf67eb0c3d5e0dfa7bfd391b690be8628ce0 100644
--- a/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
+++ b/src/app/simulator/shared/services/out-of-school-population/out-of-school-population.service.ts
@@ -85,23 +85,11 @@ export class OutOfSchoolPopulationService {
     const enrollmentCurrentYear: number = this.currentYearService.getEnrollmentCurrentYear();
     const filters: Array<string> = this.utilitiesService.getYearAndSelectLocationFilters(enrollmentCurrentYear);
 
-    // Adjustment because the data is not in the default format.
-    if (filters.length === 2) {
-      // Brazil is represented by 'state' 0 (zero).
-      filters.push('state:"0"');
-    } else if (filters.length === 4) {
-      // Remove the 'state' filter on index 2.
-      filters.splice(2, 1);
-
-      // Replace the 'city' filter with the 'state' filter.
-      filters[2] = filters[2].replace('city', 'state');
-    }
-
     const searchParams: Map<string, string> = new Map<string, string>([
       ['filter', filters.join(',')]
     ]);
 
-    searchParams.set('dims', 'pfe,state');
+    searchParams.set('dims', 'pfe');
 
     return this.httpService.getRequestOptionsWithSearchParams(searchParams);
   }