Refactor of datastore queries to JPA for platform independence
End-of-day push with recast baseFaction key