Case #4137 - Search functionality