Removed logical and source system from EI-query