diff --git a/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java b/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java
index 99241808..3966de68 100644
--- a/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java
+++ b/monicar-control-center/src/main/java/org/controlcenter/common/security/JWTFilter.java
@@ -70,8 +70,7 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
 			return;
 		} catch (BusinessException e) {
 			response.addHeader("Set-Cookie", cookieUtil.createAccessTokenCookie("", 0L).toString());
-			response.addHeader("Set-Cookie",
-				cookieUtil.createRefreshTokenCookie("", 0L).toString());
+			response.addHeader("Set-Cookie", cookieUtil.createRefreshTokenCookie("", 0L).toString());
 			errorHandler.writeErrorResponse(response, e.getErrorCode());
 			return;
 
diff --git a/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java b/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java
index b5b2acfe..c1eb1cb6 100644
--- a/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java
+++ b/monicar-control-center/src/main/java/org/controlcenter/common/util/JWTTokenValidator.java
@@ -26,7 +26,7 @@ public void validateTokens(String accessToken, String refreshToken) {
 			throw new BusinessException(FORBIDDEN_ERROR);
 		}
 
-		if (!redisUtil.isRefreshTokenValid(extractUserIdFromAccessToken(refreshToken))) {
+		if (!redisUtil.getRefreshToken(extractUserIdFromAccessToken(refreshToken)).equals(refreshToken)) {
 			throw new BusinessException(FORBIDDEN_ERROR);
 		}
 
diff --git a/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java b/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java
index ae561e24..34208692 100644
--- a/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java
+++ b/monicar-control-center/src/main/java/org/controlcenter/vehicle/infrastructure/mybatis/MyBatisVehicleInfoMapper.java
@@ -236,6 +236,7 @@ WITH filtered_events AS (
 			) latest
 			ON ve.vehicle_id = latest.vehicle_id
 			AND ve.event_at = latest.latest_event_at
+				GROUP BY ve.vehicle_id
 		)
 		SELECT
 			COUNT(vi.vehicle_id) AS allVehicles,
diff --git a/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java b/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java
index dc4e778e..a801c6f1 100644
--- a/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java
+++ b/monicar-control-center/src/main/java/org/controlcenter/vehicle/presentation/dto/SimpleVehicleInformationResponse.java
@@ -7,12 +7,12 @@
 
 @Builder
 public record SimpleVehicleInformationResponse(
-	long id,
+	long vehicleId,
 	String vehicleNumber
 ) {
 	public static SimpleVehicleInformationResponse from(VehicleInformationDocument doc) {
 		return SimpleVehicleInformationResponse.builder()
-			.id(doc.getId())
+			.vehicleId(doc.getId())
 			.vehicleNumber(doc.getVehicleNumber())
 			.build();
 	}