Some changes for TODO tag handling