Updated: Bugfix. Replaced order_by fetch clause with proper sort_by clause