[#40]Also search for project ID