Fixes even more daily search issues

Fixes some of the new problems accidentally introduced when consolidating code. Now that I've got some invites to these providers fixing up old isssues with providers and testing