FORGE-1290: Split JPAFacet