Fixed bug in enum searches, added unify rules for fields