SCP - Search tweaks