Fixup search on dynamic fields