Backported fix for search base