Change some bug of rest formator