handle renamed fields properly for _order_by