FAIMS-820: updated logic to load entities on load