Fix discriminator find with fields filter. #1820