Merge "Fix obvious typo - $search used for two variables"