diff --git a/data/filters.json b/data/filters.json
index 08133aa4..ee514eb2 100644
--- a/data/filters.json
+++ b/data/filters.json
@@ -1,4 +1,40 @@
 [
+  {
+    "id": 0,
+    "name": "CeSIUM",
+    "groupId": 0,
+    "semester": 0
+  },
+  {
+    "id": 1,
+    "name": "UMinho",
+    "groupId": 0,
+    "semester": 0
+  },
+  {
+    "id": 2,
+    "name": "SEI",
+    "groupId": 0,
+    "semester": 0
+  },
+  {
+    "id": 3,
+    "name": "CoderDojo",
+    "groupId": 0,
+    "semester": 0
+  },
+  {
+    "id": 4,
+    "name": "JOIN",
+    "groupId": 0,
+    "semester": 0
+  },
+  {
+    "id": 5,
+    "name": "JORDI",
+    "groupId": 0,
+    "semester": 0
+  },
   {
     "id": 111,
     "name": "AL",
@@ -36,7 +72,7 @@
   },
   {
     "id": 116,
-    "name": "Bilinguismo",
+    "name": "B",
     "groupId": 1,
     "semester": 1,
     "shifts": ["TP1"]
@@ -311,7 +347,7 @@
     "name": "LI4",
     "groupId": 3,
     "semester": 1,
-    "shifts": []
+    "shifts": ["OT4", "OT5"]
   },
   {
     "id": 316,
diff --git a/data/shifts.json b/data/shifts.json
index 7877fc44..e1301cec 100644
--- a/data/shifts.json
+++ b/data/shifts.json
@@ -293,7 +293,7 @@
     "theoretical": false,
     "shift": "TP1",
     "building": "CP1",
-    "room": "1.16",
+    "room": "1.40",
     "day": 4,
     "start": "11:00",
     "end": "13:00",
@@ -1311,33 +1311,21 @@
     "id": 14313,
     "title": "Comunicações por Computador",
     "theoretical": false,
-    "shift": "PL7",
-    "building": "CP1",
-    "room": "1.22",
-    "day": 0,
-    "start": "09:00",
-    "end": "11:00",
-    "filterId": 312
-  },
-  {
-    "id": 14309,
-    "title": "Cálculo de Programas",
-    "theoretical": false,
-    "shift": "TP4",
+    "shift": "PL5",
     "building": "CP2",
-    "room": "1.12",
+    "room": "2.09",
     "day": 0,
     "start": "09:00",
     "end": "11:00",
-    "filterId": 311
+    "filterId": 312
   },
   {
     "id": 14313,
     "title": "Comunicações por Computador",
     "theoretical": false,
-    "shift": "PL5",
-    "building": "CP2",
-    "room": "2.09",
+    "shift": "PL7",
+    "building": "CP1",
+    "room": "1.22",
     "day": 0,
     "start": "09:00",
     "end": "11:00",
@@ -1607,18 +1595,6 @@
     "end": "13:00",
     "filterId": 316
   },
-  {
-    "id": 14310,
-    "title": "Desenvolvimento de Sistemas de Software",
-    "theoretical": false,
-    "shift": "PL6",
-    "building": "CP2",
-    "room": "2.08",
-    "day": 3,
-    "start": "11:00",
-    "end": "13:00",
-    "filterId": 313
-  },
   {
     "id": 14309,
     "title": "Cálculo de Programas",
@@ -1632,16 +1608,16 @@
     "filterId": 311
   },
   {
-    "id": 14309,
-    "title": "Cálculo de Programas",
+    "id": 14310,
+    "title": "Desenvolvimento de Sistemas de Software",
     "theoretical": false,
-    "shift": "TP5",
+    "shift": "PL6",
     "building": "CP2",
-    "room": "1.13",
+    "room": "2.08",
     "day": 3,
     "start": "11:00",
     "end": "13:00",
-    "filterId": 311
+    "filterId": 313
   },
   {
     "id": 14313,
@@ -1655,6 +1631,18 @@
     "end": "13:00",
     "filterId": 312
   },
+  {
+    "id": 14298,
+    "title": "Laboratórios de Informática IV",
+    "theoretical": false,
+    "shift": "OT4",
+    "building": "CP3",
+    "room": "0.08",
+    "day": 0,
+    "start": "14:00",
+    "end": "16:00",
+    "filterId": 315
+  },
   {
     "id": 14312,
     "title": "Sistemas Distribuídos",
@@ -1739,6 +1727,54 @@
     "end": "18:00",
     "filterId": 314
   },
+  {
+    "id": 14298,
+    "title": "Laboratórios de Informática IV",
+    "theoretical": false,
+    "shift": "OT5",
+    "building": "CP1",
+    "room": "2.26",
+    "day": 2,
+    "start": "16:00",
+    "end": "18:00",
+    "filterId": 315
+  },
+  {
+    "id": 14298,
+    "title": "Laboratórios de Informática IV",
+    "theoretical": false,
+    "shift": "OT4",
+    "building": "CP1",
+    "room": "2.25",
+    "day": 2,
+    "start": "16:00",
+    "end": "18:00",
+    "filterId": 315
+  },
+  {
+    "id": 14309,
+    "title": "Cálculo de Programas",
+    "theoretical": false,
+    "shift": "TP4",
+    "building": "CP1",
+    "room": "1.15",
+    "day": 0,
+    "start": "18:00",
+    "end": "20:00",
+    "filterId": 311
+  },
+  {
+    "id": 14309,
+    "title": "Cálculo de Programas",
+    "theoretical": false,
+    "shift": "TP5",
+    "building": "CP1",
+    "room": "1.18",
+    "day": 1,
+    "start": "18:00",
+    "end": "20:00",
+    "filterId": 311
+  },
   {
     "id": 14600,
     "title": "Aplicações e Serviços de Computação em Nuvem",
@@ -1853,7 +1889,7 @@
     "theoretical": false,
     "shift": "PL4",
     "building": "7",
-    "room": "0.04",
+    "room": "0.07",
     "day": 3,
     "start": "09:00",
     "end": "11:00",
@@ -2093,7 +2129,7 @@
     "theoretical": false,
     "shift": "TP2",
     "building": "CP1",
-    "room": "1.16",
+    "room": "2.20",
     "day": 0,
     "start": "12:00",
     "end": "13:00",