Add $elemMatch for fields