Correction of entityid for dicovery server.