Ordering results fixes