WL-1892 Switch to displayId instead of EID.
Merge pull request #3 from ox-it/WL-1892

WL-1892 Switch to displayId instead of EID.