fixed fetching of eId