diff --git a/review/src/main/kotlin/br/all/application/study/find/service/FindAllStudyReviewsBySourceServiceImpl.kt b/review/src/main/kotlin/br/all/application/study/find/service/FindAllStudyReviewsBySourceServiceImpl.kt
index 3c96a6eb..d6c66cfd 100644
--- a/review/src/main/kotlin/br/all/application/study/find/service/FindAllStudyReviewsBySourceServiceImpl.kt
+++ b/review/src/main/kotlin/br/all/application/study/find/service/FindAllStudyReviewsBySourceServiceImpl.kt
@@ -14,7 +14,6 @@ import br.all.domain.model.review.SystematicStudy
 class FindAllStudyReviewsBySourceServiceImpl(
     private val systematicStudyRepository: SystematicStudyRepository,
     private val studyReviewRepository: StudyReviewRepository,
-   // private val protocolRepository: ProtocolRepository,
     private val credentialsService: CredentialsService,
 ) : FindAllStudyReviewsBySourceService {
 
@@ -26,18 +25,8 @@ class FindAllStudyReviewsBySourceServiceImpl(
 
         presenter.prepareIfFailsPreconditions(user, systematicStudy)
 
-        if(presenter.isDone()) return
-
         val searchSource = SearchSource(request.searchSource)
 
-//        val protocolDto = protocolRepository.findBySystematicStudy(systematicStudyId.value)
-//        val hasSource = protocolDto?.informationSources?.contains(searchSource.id) ?: false
-//
-//        if (!hasSource) {
-//            val message = "Protocol ID $systematicStudyId does not contain ${searchSource.id} as a search source"
-//            presenter.prepareFailView(NoSuchElementException(message))
-//        }
-
         if (presenter.isDone()) return
 
         val studyReviews = studyReviewRepository.findAllBySource(request.systematicStudyId, searchSource.toString())
diff --git a/web/src/main/kotlin/br/all/search/controller/SearchSessionController.kt b/web/src/main/kotlin/br/all/search/controller/SearchSessionController.kt
index 29026c2e..ad17ce73 100644
--- a/web/src/main/kotlin/br/all/search/controller/SearchSessionController.kt
+++ b/web/src/main/kotlin/br/all/search/controller/SearchSessionController.kt
@@ -269,7 +269,7 @@ class SearchSessionController(
                 description = "Success updating an existing search session of a systematic study",
                 content = [Content(
                     mediaType = "application/json",
-                    schema = Schema(implementation = UpdateSearchSessionService.ResponseModel::class)
+                    schema = Schema(implementation = PatchSearchSessionService.ResponseModel::class)
                 )]
             ),
             ApiResponse(
@@ -289,7 +289,6 @@ class SearchSessionController(
             ),
         ]
     )
-    // CHANGE API RESPONSE TEXT
     @PatchMapping("/patch-search-session/{sessionId}")
     fun patchSearchSession(
         @PathVariable systematicStudyId: UUID,
diff --git a/web/src/main/kotlin/br/all/security/service/TokenService.kt b/web/src/main/kotlin/br/all/security/service/TokenService.kt
index 79a4edd5..4201e97c 100644
--- a/web/src/main/kotlin/br/all/security/service/TokenService.kt
+++ b/web/src/main/kotlin/br/all/security/service/TokenService.kt
@@ -30,7 +30,16 @@ class TokenService(jwtProperties: JwtProperties) {
 
     fun extractUsername(token: String): String? = getAllClaims(token).subject
 
-    fun isExpired(token: String) = getAllClaims(token).expiration.before(Date(System.currentTimeMillis()))
+    fun isExpired(token: String): Boolean =
+        try {
+            val claims = getAllClaims(token)
+            val exp = claims.expiration
+            exp.before(Date())
+        } catch (e: io.jsonwebtoken.ExpiredJwtException) {
+            true
+        } catch (e: Exception) {
+            true
+        }
 
     fun isValid(token: String, userDetails: UserDetails) =
         extractUsername(token) == userDetails.username && !isExpired(token)
diff --git a/web/src/main/kotlin/br/all/utils/example/CreateSearchSessionExampleService.kt b/web/src/main/kotlin/br/all/utils/example/CreateSearchSessionExampleService.kt
index fe8f76b2..93d51896 100644
--- a/web/src/main/kotlin/br/all/utils/example/CreateSearchSessionExampleService.kt
+++ b/web/src/main/kotlin/br/all/utils/example/CreateSearchSessionExampleService.kt
@@ -47,7 +47,7 @@ class CreateSearchSessionExampleService (
         )
 
         val searchSession = SearchSessionDto(
-            id = uuidGeneratorService.next(),
+            id = studyReviews[0].searchSessionId.value,
             systematicStudyId = systematicStudyId.value(),
             userId = userId,
             searchString = searchString,