Fixed update labels and ordering