Query Formation 'Order by' fix