Fixing tags in TODO