Fixed the issue with searching