Fixed route, added current = 0,1 to labels array for /marks/label label array
Merge branch '36-model-update' into 37-main-redesign