Added initiator and picker criterion to search switch statement logic