Temporary fix for search