DDF-675: added SearchSerivce with merge fixes