Improved search and fix to AddProject