bug fixes in JPA and order service