Don't premature end search for id attribute

When looking for the ID attribute, the existing code would only consider Id and not move on to look for ID.  This change corrects that.