Added map and some bugs for related content refs #1992