Fixes for order by (__order)