Revert "Revert "Updated Search Jobs to use new code""

This reverts commit 86812d9acfa7f8e9949bc531aa6549c88f53c7d3.