more Find Vacancy fixes
Merge pull request #526 from yashodha/vacany-fixes

more Find Vacancy fixes