Improve tag collection rendering