Address Hibernate @OrderBy annotation that is no longer working the same as it did in previous versions