Bug fix for broken search