Quick hotfix for search data lookup