Spotlight Native D2W & DisambiguationPolicy & D2W related code adaptions

See Issue #3