Added search support for Polymorphic fields