Bug 1097751 - Fix bugId lookup