Fixed issues created by the previous commit, where the cluster order was sometimes reversed in some views.