Fix up search on dynamic fields

Fix adding fields to an existing form