National: fixed most of the issues reported in ALLI-1303.