fix for inability to find unnormalized entities
refactored and added adapterManager, deleted key container