90% fix of claim tags, autocomplete