WIP, trying to fix JPA issues with workflow rules and conditions
fixed one instance of a jpa issue