Fix tags and entity reference

Change-Id: I7e2d65898f394bf67b20d276d1ab4c4b31d7d5cc
1 file changed