Fixing tags and a display bug