Fix issues remaining with custom search path changes
Merge pull request #83 from JandyCo/fix-custom-search-path-issues

Fix issues remaining with custom search path changes