Fix for search not working