Added EhdID search, collapsing