corrected entities mapping