Order By seems working (next step is to test against bsbm again) - but the expression needs some polishing