O3656-6 Deep Dive into Search Scenarios

Contains requested updates