Moved searchprovider.php, rebased the patch.