Fix discriminator map search