SCP policy search formatting fixes