more Find Vacancy fixes

more Find Vacancy fixes