researching fixing entity associations