*8665* Fix searching