Change to old SelectiveSearchPcode