Change commenting of addQueryString
Move claim breadcrumbs to a macro as per suggestion