DDF-676: Added additional code to support search by multiple types; unit tests