fix correct variable
change default of assignee
separate variable sets