Add single digit context and correct context labels