bugs fixes searching