Fix Bug 884404 - Search on MakeID not on URL, handle no make found errors