Hotfix. Search added. Optimization performance