Fixed issue with search