SCP - Added claims search (first pass)