Added proper search switch to paksee