Relevancy score adjustments and bug fixes (recursion)