Adding search for fields