diff --git a/project/Dockerfile b/project/Dockerfile
index 591bb75..db0c480 100644
--- a/project/Dockerfile
+++ b/project/Dockerfile
@@ -17,4 +17,4 @@ COPY . .
 
 ENV PYTHONUNBUFFERED=1
 
-CMD ["gunicorn", "--timeout", "600", "--workers", "2", "--bind", "0.0.0.0:5000", "app:app"]
+CMD ["gunicorn", "--timeout", "600", "--workers", "1", "--bind", "0.0.0.0:5000", "app:app"]
diff --git a/project/frontend/src/components/KennzahlenTable.tsx b/project/frontend/src/components/KennzahlenTable.tsx
index 5808a5f..db0a891 100644
--- a/project/frontend/src/components/KennzahlenTable.tsx
+++ b/project/frontend/src/components/KennzahlenTable.tsx
@@ -225,61 +225,75 @@ export default function KennzahlenTable({
 												</Box>
 											</Tooltip>
 										) : (
-											<Box
-												sx={{
-													border: `2px solid ${borderColor}`,
-													borderRadius: 1,
-													padding: "4px 8px",
-													display: "flex",
-													alignItems: "center",
-													justifyContent: "space-between",
-													width: "100%",
-													cursor: "text",
-												}}
+											<Tooltip
+												title={hasNoValue ?
+													<>
+														<b>Problem</b>
+														<br />
+														Es wurden keine Kennzahlen gefunden. Bitte ergänzen!
+													</> : ""
+												}
+												placement="bottom"
+												arrow
 											>
-												<Box
-													sx={{
-														display: "flex",
-														alignItems: "center",
-														gap: 1,
-														width: "100%",
-													}}
-												>
-													{hasNoValue && (
-														<ErrorOutlineIcon fontSize="small" color="error" />
-													)}
-													{editingIndex === row.setting.name ? (
-														<TextField
-															value={editValue}
-															onChange={(e) => setEditValue(e.target.value)}
-															onKeyDown={(e) =>
-																handleKeyPress(e, row.setting.name)
-															}
-															onBlur={() => handleSave(row.setting.name)}
-															autoFocus
-															size="small"
-															fullWidth
-															variant="standard"
-															sx={{ margin: "-8px 0" }}
+												<span>
+													<Box
+														sx={{
+															border: `2px solid ${borderColor}`,
+															borderRadius: 1,
+															padding: "4px 8px",
+															display: "flex",
+															alignItems: "center",
+															justifyContent: "space-between",
+															width: "100%",
+															cursor: "text",
+														}}
+													>
+														<Box
+															sx={{
+																display: "flex",
+																alignItems: "center",
+																gap: 1,
+																width: "100%",
+															}}
+														>
+															{hasNoValue && (
+																<ErrorOutlineIcon fontSize="small" color="error" />
+															)}
+															{editingIndex === row.setting.name ? (
+																<TextField
+																	value={editValue}
+																	onChange={(e) => setEditValue(e.target.value)}
+																	onKeyDown={(e) =>
+																		handleKeyPress(e, row.setting.name)
+																	}
+																	onBlur={() => handleSave(row.setting.name)}
+																	autoFocus
+																	size="small"
+																	fullWidth
+																	variant="standard"
+																	sx={{ margin: "-8px 0" }}
+																/>
+															) : (
+																<span>
+																	{row.extractedValues.at(0)?.entity || "—"}
+																</span>
+															)}
+														</Box>
+														<EditIcon
+															fontSize="small"
+															sx={{ color: "#555", cursor: "pointer" }}
+															onClick={(e) => {
+																e.stopPropagation();
+																startEditing(
+																	row.extractedValues.at(0)?.entity || "",
+																	row.setting.name,
+																);
+															}}
 														/>
-													) : (
-														<span>
-															{row.extractedValues.at(0)?.entity || "—"}
-														</span>
-													)}
-												</Box>
-												<EditIcon
-													fontSize="small"
-													sx={{ color: "#555", cursor: "pointer" }}
-													onClick={(e) => {
-														e.stopPropagation();
-														startEditing(
-															row.extractedValues.at(0)?.entity || "",
-															row.setting.name,
-														);
-													}}
-												/>
-											</Box>
+													</Box>
+												</span>
+											</Tooltip>
 										)}
 									</TableCell>
 									<TableCell align="center">