Reworking the cluster review process to use seperate connections to raw and entity tables