[FIX][T4602] Search fields

Merged Hermes requested to merge T4602 into 12.0
  1. Jun 10, 2024