Adding badge lookup by claim code, other fixes