fix for removing search in add check type

Reviewer: Tiff Go (post commit)

Issue:     GCP-8954