Save Rule, Some JPA and JSON Fixes