Fixed issues with search