Moved comment reading to special tag