removed unnecessary escapes and fixed add claim selection